diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-05-12 22:29:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-12 22:29:14 +0200 |
| commit | 5aaca7a7a5db157530d195c4b93c8fc4682f8a48 (patch) | |
| tree | 1c9a2a7e898c8a460bc10d7f3c5c8308188c0072 /arch/ppc/kernel/setup.c | |
| parent | 8c6b0ef2ea1bb42cd72d987389297f66cd25790b (diff) | |
| parent | 9404ef02974a5411687b6c1b8ef3984305620e02 (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'arch/ppc/kernel/setup.c')
| -rw-r--r-- | arch/ppc/kernel/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index bfddfdee0b6..51e8094f52d 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c @@ -36,6 +36,7 @@ #include <asm/nvram.h> #include <asm/xmon.h> #include <asm/ocp.h> +#include <asm/irq.h> #define USES_PPC_SYS (defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \ defined(CONFIG_PPC_MPC52xx)) |