Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / staging / smbfs / smb_fs_sb.h

diff --git a/include/linux/smb_fs_sb.h b/drivers/staging/smbfs/smb_fs_sb.h
similarity index 98%
rename from include/linux/smb_fs_sb.h
rename to drivers/staging/smbfs/smb_fs_sb.h
index bb947dd1fba92515170f1a5de745dde34026eb0a..ca058afda900bbb6d8cb73c8c22b9c0d6c2cede6 100644 (file)
--- a/include/linux/smb_fs_sb.h
+++ b/drivers/staging/smbfs/smb_fs_sb.h
@@ -11,7 +11,7 @@
 
 #include <linux/types.h>
 #include <linux/backing-dev.h>
-#include <linux/smb.h>
+#include "smb.h"
 
 /*
  * Upper limit on the total number of active smb_request structs.