Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / include / linux / ceph / auth.h

diff --git a/include/linux/ceph/auth.h b/include/linux/ceph/auth.h
index 1563265d209740aadc845d28c1389091c5249728..374bb1c4ef52925a3ce3b55b829587503a0088fa 100644 (file)
--- a/include/linux/ceph/auth.h
+++ b/include/linux/ceph/auth.h
@@ -104,7 +104,7 @@ extern int ceph_auth_build_hello(struct ceph_auth_client *ac,
 extern int ceph_handle_auth_reply(struct ceph_auth_client *ac,
                                  void *buf, size_t len,
                                  void *reply_buf, size_t reply_len);
-extern int ceph_entity_name_encode(const char *name, void **p, void *end);
+int ceph_auth_entity_name_encode(const char *name, void **p, void *end);
 
 extern int ceph_build_auth(struct ceph_auth_client *ac,
                    void *msg_buf, size_t msg_len);