diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/smb_fs_i.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/smb_fs_i.h')
| -rw-r--r-- | include/linux/smb_fs_i.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/smb_fs_i.h b/include/linux/smb_fs_i.h index 8516954a5141..8ccf4eca2c3d 100644 --- a/include/linux/smb_fs_i.h +++ b/include/linux/smb_fs_i.h | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #ifndef _LINUX_SMB_FS_I | 9 | #ifndef _LINUX_SMB_FS_I |
| 10 | #define _LINUX_SMB_FS_I | 10 | #define _LINUX_SMB_FS_I |
| 11 | 11 | ||
| 12 | #ifdef __KERNEL__ | ||
| 13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 14 | #include <linux/fs.h> | 13 | #include <linux/fs.h> |
| 15 | 14 | ||
| @@ -36,4 +35,3 @@ struct smb_inode_info { | |||
| 36 | }; | 35 | }; |
| 37 | 36 | ||
| 38 | #endif | 37 | #endif |
| 39 | #endif | ||