Merge 'staging-next' to Linus's tree

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

diff --git a/fs/smbfs/inode.c b/drivers/staging/smbfs/inode.c
similarity index 99%
rename from fs/smbfs/inode.c
rename to drivers/staging/smbfs/inode.c
index f6e9ee59757ec29c11be43e6fcab2713bab2562e..552951aa749834ebc9d61baa4368d066e9f858ef 100644 (file)
--- a/fs/smbfs/inode.c
+++ b/drivers/staging/smbfs/inode.c
@@ -26,13 +26,13 @@
 #include <linux/vfs.h>
 #include <linux/highuid.h>
 #include <linux/sched.h>
-#include <linux/smb_fs.h>
-#include <linux/smbno.h>
-#include <linux/smb_mount.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
 
+#include "smb_fs.h"
+#include "smbno.h"
+#include "smb_mount.h"
 #include "smb_debug.h"
 #include "getopt.h"
 #include "proto.h"
@@ -505,7 +505,7 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
        if (warn_count < 5) {
                warn_count++;
                printk(KERN_EMERG "smbfs is deprecated and will be removed"
-                       " from the 2.6.27 kernel. Please migrate to cifs\n");
+                       " from the 2.6.37 kernel. Please migrate to cifs\n");
        }
 
        if (!raw_data)