Merge tag 'v3.5-rc1'

[pandora-kernel.git] / net / ceph / ceph_common.c

diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index c815f31..58b09ef 100644 (file)
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -441,8 +441,8 @@ EXPORT_SYMBOL(ceph_client_id);
  * create a fresh client instance
  */
 struct ceph_client *ceph_create_client(struct ceph_options *opt, void *private,
-                                      unsigned supported_features,
-                                      unsigned required_features)
+                                      unsigned int supported_features,
+                                      unsigned int required_features)
 {
        struct ceph_client *client;
        struct ceph_entity_addr *myaddr = NULL;