From 06010fb588700e7fcb29e720c56884e3de5fd327 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Sun, 17 Apr 2011 13:49:55 +0200 Subject: sparc32: cleanup code for pci init Move the ifdeffery to a header file to make the logic more obvious where we decide between PCI or SBUS init Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller --- arch/sparc/kernel/irq_32.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'arch/sparc/kernel/irq_32.c') diff --git a/arch/sparc/kernel/irq_32.c b/arch/sparc/kernel/irq_32.c index 7c93df4099c..b2dbb4ba860 100644 --- a/arch/sparc/kernel/irq_32.c +++ b/arch/sparc/kernel/irq_32.c @@ -607,14 +607,11 @@ void __init init_IRQ(void) break; case sun4m: -#ifdef CONFIG_PCI pcic_probe(); - if (pcic_present()) { + if (pcic_present()) sun4m_pci_init_IRQ(); - break; - } -#endif - sun4m_init_IRQ(); + else + sun4m_init_IRQ(); break; case sun4d: -- cgit v1.2.3-70-g09d2