diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 09:19:53 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 09:19:53 (GMT) |
commit | 064a32d82c20cdcb0119a8b316eb520608d8c647 (patch) | |
tree | c67d534bd4458b1482c11f11c724fe93beca4f80 /arch/ppc/kernel/setup.c | |
parent | 0327318445d55808991a63137cfb698a90ab6adf (diff) | |
parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
download | linux-fsl-qoriq-064a32d82c20cdcb0119a8b316eb520608d8c647.tar.xz |
Merge branch 'linus' into x86/memtest
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 bfddfde..51e8094 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)) |