diff --git a/[refs] b/[refs]
index 52bc59a176aa..40e59a5b73d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d0d63bd7a9c0a6373c7759cb55580b806269dae
+refs/heads/master: 2418a628ff9d1cfc4fecd9899f915326ff6e7b96
diff --git a/trunk/drivers/staging/p9auth/p9auth.c b/trunk/drivers/staging/p9auth/p9auth.c
index e2a8753ecd0c..3cac89b26faf 100644
--- a/trunk/drivers/staging/p9auth/p9auth.c
+++ b/trunk/drivers/staging/p9auth/p9auth.c
@@ -6,33 +6,23 @@
  * Released under the GPLv2
  *
  */
-#include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/moduleparam.h>
 #include <linux/slab.h>
 #include <linux/fs.h>
 #include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/proc_fs.h>
 #include <linux/fcntl.h>
 #include <linux/cdev.h>
-#include <linux/syscalls.h>
 #include <linux/uaccess.h>
 #include <linux/list.h>
-#include <linux/err.h>
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/crypto.h>
 #include <linux/highmem.h>
-#include <linux/jiffies.h>
-#include <linux/timex.h>
-#include <linux/interrupt.h>
 #include <linux/scatterlist.h>
-#include <linux/crypto.h>
 #include <linux/sched.h>
 #include <linux/cred.h>
-#include <asm/system.h>
 
 #ifndef CAP_MAJOR
 #define CAP_MAJOR 0