Merge branch 'master' into tk71

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

diff --git a/fs/smbfs/request.c b/drivers/staging/smbfs/request.c
similarity index 99%
rename from fs/smbfs/request.c
rename to drivers/staging/smbfs/request.c
index 45f45933e86279126f1f349b2381563c102d0559..3e7716864306a932980c9e5ce0908ea69dd32d4e 100644 (file)
--- a/fs/smbfs/request.c
+++ b/drivers/staging/smbfs/request.c
@@ -13,10 +13,9 @@
 #include <linux/net.h>
 #include <linux/sched.h>
 
-#include <linux/smb_fs.h>
-#include <linux/smbno.h>
-#include <linux/smb_mount.h>
-
+#include "smb_fs.h"
+#include "smbno.h"
+#include "smb_mount.h"
 #include "smb_debug.h"
 #include "request.h"
 #include "proto.h"