Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / staging / smbfs / sock.c

diff --git a/fs/smbfs/sock.c b/drivers/staging/smbfs/sock.c
similarity index 99%
rename from fs/smbfs/sock.c
rename to drivers/staging/smbfs/sock.c
index e37fe4deebd0ebe5050e1fbab7c9ef7cbc2ad4db..9e264090e611e5d99de0e23fdde578090074141e 100644 (file)
--- a/fs/smbfs/sock.c
+++ b/drivers/staging/smbfs/sock.c
@@ -22,13 +22,12 @@
 #include <net/tcp_states.h>
 #include <net/ip.h>
 
-#include <linux/smb_fs.h>
-#include <linux/smb.h>
-#include <linux/smbno.h>
-
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
 
+#include "smb_fs.h"
+#include "smb.h"
+#include "smbno.h"
 #include "smb_debug.h"
 #include "proto.h"
 #include "request.h"