diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
| commit | d585a021c0b10b0477d6b608c53e1feb8cde0507 (patch) | |
| tree | 5ca059da1db7f15d4b29427644ad9c08270c885c /include/linux/auto_fs.h | |
| parent | 84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'include/linux/auto_fs.h')
| -rw-r--r-- | include/linux/auto_fs.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h index c21e5972a3e8..63265852b7d1 100644 --- a/include/linux/auto_fs.h +++ b/include/linux/auto_fs.h | |||
| @@ -17,11 +17,13 @@ | |||
| 17 | #ifdef __KERNEL__ | 17 | #ifdef __KERNEL__ |
| 18 | #include <linux/fs.h> | 18 | #include <linux/fs.h> |
| 19 | #include <linux/limits.h> | 19 | #include <linux/limits.h> |
| 20 | #include <linux/types.h> | ||
| 21 | #include <linux/ioctl.h> | ||
| 22 | #else | ||
| 20 | #include <asm/types.h> | 23 | #include <asm/types.h> |
| 24 | #include <sys/ioctl.h> | ||
| 21 | #endif /* __KERNEL__ */ | 25 | #endif /* __KERNEL__ */ |
| 22 | 26 | ||
| 23 | #include <linux/ioctl.h> | ||
| 24 | |||
| 25 | /* This file describes autofs v3 */ | 27 | /* This file describes autofs v3 */ |
| 26 | #define AUTOFS_PROTO_VERSION 3 | 28 | #define AUTOFS_PROTO_VERSION 3 |
| 27 | 29 | ||