Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / drivers / staging / smbfs / proc.c

diff --git a/fs/smbfs/proc.c b/drivers/staging/smbfs/proc.c
similarity index 99%
rename from fs/smbfs/proc.c
rename to drivers/staging/smbfs/proc.c
index 3dcf638d4d3a0ff836fd9aba946361edd894b630..ba37b1fae182f08fa23e7891ee2efe08b35b3976 100644 (file)
--- a/fs/smbfs/proc.c
+++ b/drivers/staging/smbfs/proc.c
@@ -20,15 +20,14 @@
 #include <linux/smp_lock.h>
 #include <linux/net.h>
 #include <linux/vfs.h>
-#include <linux/smb_fs.h>
-#include <linux/smbno.h>
-#include <linux/smb_mount.h>
-
 #include <net/sock.h>
 
 #include <asm/string.h>
 #include <asm/div64.h>
 
+#include "smb_fs.h"
+#include "smbno.h"
+#include "smb_mount.h"
 #include "smb_debug.h"
 #include "proto.h"
 #include "request.h"