diff options
| author | James Morris <jmorris@namei.org> | 2009-06-08 19:27:53 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-08 19:27:53 -0400 |
| commit | 0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f (patch) | |
| tree | 1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed /include/linux/auto_fs.h | |
| parent | 04288f42033607099cebf5ca15ce8dcec3a9688b (diff) | |
| parent | 3af968e066d593bc4dacc021715f3e95ddf0996f (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/auto_fs.h')
| -rw-r--r-- | include/linux/auto_fs.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h index 63265852b7d1..7b09c8348fd3 100644 --- a/include/linux/auto_fs.h +++ b/include/linux/auto_fs.h | |||
| @@ -14,13 +14,12 @@ | |||
| 14 | #ifndef _LINUX_AUTO_FS_H | 14 | #ifndef _LINUX_AUTO_FS_H |
| 15 | #define _LINUX_AUTO_FS_H | 15 | #define _LINUX_AUTO_FS_H |
| 16 | 16 | ||
| 17 | #include <linux/types.h> | ||
| 17 | #ifdef __KERNEL__ | 18 | #ifdef __KERNEL__ |
| 18 | #include <linux/fs.h> | 19 | #include <linux/fs.h> |
| 19 | #include <linux/limits.h> | 20 | #include <linux/limits.h> |
| 20 | #include <linux/types.h> | ||
| 21 | #include <linux/ioctl.h> | 21 | #include <linux/ioctl.h> |
| 22 | #else | 22 | #else |
| 23 | #include <asm/types.h> | ||
| 24 | #include <sys/ioctl.h> | 23 | #include <sys/ioctl.h> |
| 25 | #endif /* __KERNEL__ */ | 24 | #endif /* __KERNEL__ */ |
| 26 | 25 | ||