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_dev-ioctl.h | |
| parent | 84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'include/linux/auto_dev-ioctl.h')
| -rw-r--r-- | include/linux/auto_dev-ioctl.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/auto_dev-ioctl.h b/include/linux/auto_dev-ioctl.h index 91a773993a5c..850f39b33e74 100644 --- a/include/linux/auto_dev-ioctl.h +++ b/include/linux/auto_dev-ioctl.h | |||
| @@ -10,8 +10,13 @@ | |||
| 10 | #ifndef _LINUX_AUTO_DEV_IOCTL_H | 10 | #ifndef _LINUX_AUTO_DEV_IOCTL_H |
| 11 | #define _LINUX_AUTO_DEV_IOCTL_H | 11 | #define _LINUX_AUTO_DEV_IOCTL_H |
| 12 | 12 | ||
| 13 | #include <linux/auto_fs.h> | ||
| 14 | |||
| 15 | #ifdef __KERNEL__ | ||
| 13 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 14 | #include <linux/types.h> | 17 | #else |
| 18 | #include <string.h> | ||
| 19 | #endif /* __KERNEL__ */ | ||
| 15 | 20 | ||
| 16 | #define AUTOFS_DEVICE_NAME "autofs" | 21 | #define AUTOFS_DEVICE_NAME "autofs" |
| 17 | 22 | ||