diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
| commit | 4854c7b27f0975a2b629f35ea3996d2968eb7c4f (patch) | |
| tree | 4102bdb70289764a2058aff0f907b13d7cf0e0d1 /include/linux/smb_fs.h | |
| parent | 3cbd5b32cb625f5c0f1b1476d154fac873dd49ce (diff) | |
| parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/smb_fs.h')
| -rw-r--r-- | include/linux/smb_fs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/smb_fs.h b/include/linux/smb_fs.h index 621a3d3662f3..367d6c3e8ed4 100644 --- a/include/linux/smb_fs.h +++ b/include/linux/smb_fs.h | |||
| @@ -10,8 +10,6 @@ | |||
| 10 | #define _LINUX_SMB_FS_H | 10 | #define _LINUX_SMB_FS_H |
| 11 | 11 | ||
| 12 | #include <linux/smb.h> | 12 | #include <linux/smb.h> |
| 13 | #include <linux/smb_fs_i.h> | ||
| 14 | #include <linux/smb_fs_sb.h> | ||
| 15 | 13 | ||
| 16 | /* | 14 | /* |
| 17 | * ioctl commands | 15 | * ioctl commands |
| @@ -24,6 +22,8 @@ | |||
| 24 | 22 | ||
| 25 | 23 | ||
| 26 | #ifdef __KERNEL__ | 24 | #ifdef __KERNEL__ |
| 25 | #include <linux/smb_fs_i.h> | ||
| 26 | #include <linux/smb_fs_sb.h> | ||
| 27 | 27 | ||
| 28 | #include <linux/fs.h> | 28 | #include <linux/fs.h> |
| 29 | #include <linux/pagemap.h> | 29 | #include <linux/pagemap.h> |