aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2005-11-24 01:34:03 -0500
committerPaul Mackerras <paulus@samba.org>2006-01-08 22:50:38 -0500
commit9177ae4378add0126104e2966aa6150258610d59 (patch)
treec5226356d7c59a03c1e96dcfafda7ab99f6d92ae
parent404849bbd2bfd62e05b36f4753f6e1af6050a824 (diff)
[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>
-rw-r--r--arch/powerpc/platforms/powermac/pic.c4
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)
459 mpic_setup_cascade(irqctrler2->intrs[0].line, 459 mpic_setup_cascade(irqctrler2->intrs[0].line,
460 pmac_u3_cascade, mpic2); 460 pmac_u3_cascade, mpic2);
461 } 461 }
462#ifdef CONFIG_XMON 462#if defined(CONFIG_XMON) && defined(CONFIG_PPC32)
463 { 463 {
464 struct device_node* pswitch; 464 struct device_node* pswitch;
465 int nmi_irq; 465 int nmi_irq;
@@ -471,7 +471,7 @@ void __init pmac_pic_init(void)
471 setup_irq(nmi_irq, &xmon_action); 471 setup_irq(nmi_irq, &xmon_action);
472 } 472 }
473 } 473 }
474#endif /* CONFIG_XMON */ 474#endif /* defined(CONFIG_XMON) && defined(CONFIG_PPC32) */
475 return; 475 return;
476 } 476 }
477 irqctrler = NULL; 477 irqctrler = NULL;