diff --git a/[refs] b/[refs] index cef0b1be899b..21b5e59223e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0531d7b36b9894b60ba9c0633993d49a813555ff +refs/heads/master: de4cbfb5994465e7c0f4cc545722b1144e8ba717 diff --git a/trunk/arch/m68knommu/kernel/irq.c b/trunk/arch/m68knommu/kernel/irq.c index 73daaf0a4552..c9cac36d4422 100644 --- a/trunk/arch/m68knommu/kernel/irq.c +++ b/trunk/arch/m68knommu/kernel/irq.c @@ -29,31 +29,6 @@ asmlinkage void do_IRQ(int irq, struct pt_regs *regs) set_irq_regs(oldregs); } -#if !defined(CONFIG_COLDFIRE) - -static struct irq_chip m_irq_chip = { - .name = "M68K-INTC", - .enable = enable_vector, - .disable = disable_vector, - .ack = ack_vector, -}; - -void __init init_IRQ(void) -{ - int irq; - - init_vectors(); - - for (irq = 0; (irq < NR_IRQS); irq++) { - irq_desc[irq].status = IRQ_DISABLED; - irq_desc[irq].action = NULL; - irq_desc[irq].depth = 1; - irq_desc[irq].chip = &m_irq_chip; - } -} - -#endif - int show_interrupts(struct seq_file *p, void *v) { struct irqaction *ap;