diff --git a/[refs] b/[refs]
index 4bd58cbd65f2..8ce9a5b29415 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64ed20165f3523402465ed465476e0457765a30f
+refs/heads/master: 24e4688632c8ae95760cb917ee5f42348fa22cbf
diff --git a/trunk/drivers/staging/p9auth/p9auth.c b/trunk/drivers/staging/p9auth/p9auth.c
index 8ccfff723eec..db7962621210 100644
--- a/trunk/drivers/staging/p9auth/p9auth.c
+++ b/trunk/drivers/staging/p9auth/p9auth.c
@@ -334,6 +334,7 @@ static const struct file_operations cap_fops = {
 	.release = cap_release,
 };
 
+/* no __exit here because it can be called by the init function */
 static void cap_cleanup_module(void)
 {
 	int i;
@@ -360,7 +361,7 @@ static void cap_setup_cdev(struct cap_dev *dev, int index)
 		printk(KERN_NOTICE "Error %d adding cap%d", err, index);
 }
 
-static int cap_init_module(void)
+static int __init cap_init_module(void)
 {
 	int result, i;
 	dev_t dev = 0;