diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-31 11:32:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 16:30:01 -0500 |
| commit | 9d45cf9e36bf9bcf16df6e1cbf049807c8402823 (patch) | |
| tree | 2118a16701418af10d215d2174df7ee0a5cbe6bd /include/linux/auto_fs4.h | |
| parent | a146649bc19d5eba4f5bfac6720c5f252d517a71 (diff) | |
| parent | 0cd5c3c80a0ebd68c08312fa7d8c13149cc61c4c (diff) | |
Merge branch 'x86/urgent' into x86/apic
Conflicts:
arch/x86/mach-default/setup.c
Semantic merge:
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/auto_fs4.h')
| -rw-r--r-- | include/linux/auto_fs4.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/auto_fs4.h b/include/linux/auto_fs4.h index 55fa478bd639..8b49ac48a5b7 100644 --- a/include/linux/auto_fs4.h +++ b/include/linux/auto_fs4.h | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #define _LINUX_AUTO_FS4_H | 12 | #define _LINUX_AUTO_FS4_H |
| 13 | 13 | ||
| 14 | /* Include common v3 definitions */ | 14 | /* Include common v3 definitions */ |
| 15 | #include <linux/types.h> | ||
| 15 | #include <linux/auto_fs.h> | 16 | #include <linux/auto_fs.h> |
| 16 | 17 | ||
| 17 | /* autofs v4 definitions */ | 18 | /* autofs v4 definitions */ |