m68knommu: use general interrupt controller for ColdFire 520x family

[net-next-2.6.git] / arch / m68knommu / kernel / irq.c

diff --git a/arch/m68knommu/kernel/irq.c b/arch/m68knommu/kernel/irq.c
index 56e0f4c55a67bb32b9d9bdf4b147519de774f68d..47f6af57e18e74d77d42d1fc38b5649ea44ca9f7 100644 (file)
--- a/arch/m68knommu/kernel/irq.c
+++ b/arch/m68knommu/kernel/irq.c
@@ -29,10 +29,7 @@ asmlinkage void do_IRQ(int irq, struct pt_regs *regs)
        set_irq_regs(oldregs);
 }
 
-void ack_bad_irq(unsigned int irq)
-{
-       printk(KERN_ERR "IRQ: unexpected irq=%d\n", irq);
-}
+#if !defined(CONFIG_M520x)
 
 static struct irq_chip m_irq_chip = {
        .name           = "M68K-INTC",
@@ -55,6 +52,8 @@ void __init init_IRQ(void)
        }
 }
 
+#endif
+
 int show_interrupts(struct seq_file *p, void *v)
 {
        struct irqaction *ap;