diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:04 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:04 -0500 |
| commit | 95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c (patch) | |
| tree | aa2aac22a5b329b778a6771a87bbf1945ad49bbd /include/linux/nubus.h | |
| parent | d278c48435625cb6b7edcf6a547620768b175709 (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into perfcounters/core
Conflicts:
arch/x86/kernel/setup_percpu.c
arch/x86/mm/fault.c
drivers/acpi/processor_idle.c
kernel/irq/handle.c
Diffstat (limited to 'include/linux/nubus.h')
| -rw-r--r-- | include/linux/nubus.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/nubus.h b/include/linux/nubus.h index c4355076d1a5..7382af374731 100644 --- a/include/linux/nubus.h +++ b/include/linux/nubus.h | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #ifndef LINUX_NUBUS_H | 12 | #ifndef LINUX_NUBUS_H |
| 13 | #define LINUX_NUBUS_H | 13 | #define LINUX_NUBUS_H |
| 14 | 14 | ||
| 15 | #include <linux/types.h> | ||
| 15 | #ifdef __KERNEL__ | 16 | #ifdef __KERNEL__ |
| 16 | #include <asm/nubus.h> | 17 | #include <asm/nubus.h> |
| 17 | #endif | 18 | #endif |