diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /include/linux/auto_dev-ioctl.h | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
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 | ||