diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-11-24 09:34:03 +0300 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-09 06:50:38 +0300 |
| commit | 9177ae4378add0126104e2966aa6150258610d59 (patch) | |
| tree | c5226356d7c59a03c1e96dcfafda7ab99f6d92ae /arch/powerpc/platforms/powermac/pic.c | |
| parent | 404849bbd2bfd62e05b36f4753f6e1af6050a824 (diff) | |
| download | linux-9177ae4378add0126104e2966aa6150258610d59.tar.xz | |
[PATCH] powerpc: Fix g5 build with xmon
My previous patches inadvertently broke building a G5 kernel with
CONFIG_XMON enabled. This fixes it.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/powermac/pic.c')
| -rw-r--r-- | arch/powerpc/platforms/powermac/pic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c index ff78eeac10f2..a36527c98133 100644 --- a/arch/powerpc/platforms/powermac/pic.c +++ b/arch/powerpc/platforms/powermac/pic.c @@ -459,7 +459,7 @@ void __init pmac_pic_init(void) mpic_setup_cascade(irqctrler2->intrs[0].line, pmac_u3_cascade, mpic2); } -#ifdef CONFIG_XMON +#if defined(CONFIG_XMON) && defined(CONFIG_PPC32) { struct device_node* pswitch; int nmi_irq; @@ -471,7 +471,7 @@ void __init pmac_pic_init(void) setup_irq(nmi_irq, &xmon_action); } } -#endif /* CONFIG_XMON */ +#endif /* defined(CONFIG_XMON) && defined(CONFIG_PPC32) */ return; } irqctrler = NULL; |