Merge 'staging-next' to Linus's tree

[sfrench/cifs-2.6.git] / drivers / staging / smbfs / dir.c

diff --git a/fs/smbfs/dir.c b/drivers/staging/smbfs/dir.c
similarity index 99%
rename from fs/smbfs/dir.c
rename to drivers/staging/smbfs/dir.c
index f678d421e54166917f7c8ca7cf3a51632cbd1d52..f088ea2f6ac9f27991d605b4093666d1a3d0843c 100644 (file)
--- a/fs/smbfs/dir.c
+++ b/drivers/staging/smbfs/dir.c
@@ -15,9 +15,9 @@
 #include <linux/net.h>
 #include <linux/sched.h>
 
-#include <linux/smb_fs.h>
-#include <linux/smb_mount.h>
-#include <linux/smbno.h>
+#include "smb_fs.h"
+#include "smb_mount.h"
+#include "smbno.h"
 
 #include "smb_debug.h"
 #include "proto.h"