diff --git a/[refs] b/[refs]
index f5dbe0550016..667710dbbad9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cdcb56636717ccb935dc66c5d56681eaa5941c1
+refs/heads/master: 58908d093e77224973b3f7bf54470d51949ff110
diff --git a/trunk/include/linux/ncp_fs.h b/trunk/include/linux/ncp_fs.h
index 96dc237b8f03..b208f0cd556b 100644
--- a/trunk/include/linux/ncp_fs.h
+++ b/trunk/include/linux/ncp_fs.h
@@ -12,8 +12,6 @@
 #include <linux/in.h>
 #include <linux/types.h>
 
-#include <linux/ncp_fs_i.h>
-#include <linux/ncp_fs_sb.h>
 #include <linux/ipx.h>
 #include <linux/ncp_no.h>
 
@@ -146,7 +144,8 @@ struct ncp_nls_ioctl
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
+#include <linux/ncp_fs_i.h>
+#include <linux/ncp_fs_sb.h>
 
 /* undef because public define in umsdos_fs.h (ncp_fs.h isn't public) */
 #undef PRINTK