1 files changed, 0 insertions, 22 deletions

diff --git a/arch/m68k/apollo/dn_ints.c b/arch/m68k/apollo/dn_ints.c
index fc190b34b621..b7d0aa37d199 100644
--- a/arch/m68k/apollo/dn_ints.c
+++ b/arch/m68k/apollo/dn_ints.c
@@ -1,23 +1,9 @@
 #include <linux/interrupt.h>
-#ifdef CONFIG_GENERIC_HARDIRQS
 #include <linux/irq.h>
-#else
-#include <asm/irq.h>
-#endif
 
 #include <asm/traps.h>
 #include <asm/apollohw.h>
 
-#ifndef CONFIG_GENERIC_HARDIRQS
-void dn_process_int(unsigned int irq, struct pt_regs *fp)
-{
-        do_IRQ(irq, fp);
-
-        *(volatile unsigned char *)(pica)=0x20;
-        *(volatile unsigned char *)(picb)=0x20;
-}
-#endif
-
 unsigned int apollo_irq_startup(struct irq_data *data)
 {
         unsigned int irq = data->irq;
@@ -39,31 +25,23 @@ void apollo_irq_shutdown(struct irq_data *data)
                 *(volatile unsigned char *)(picb+1) |= (1 << (irq - 8));
 }
 
-#ifdef CONFIG_GENERIC_HARDIRQS
 void apollo_irq_eoi(struct irq_data *data)
 {
         *(volatile unsigned char *)(pica) = 0x20;
         *(volatile unsigned char *)(picb) = 0x20;
 }
-#endif
 
 static struct irq_chip apollo_irq_chip = {
         .name           = "apollo",
         .irq_startup    = apollo_irq_startup,
         .irq_shutdown   = apollo_irq_shutdown,
-#ifdef CONFIG_GENERIC_HARDIRQS
         .irq_eoi        = apollo_irq_eoi,
-#endif
 };
 
 
 void __init dn_init_IRQ(void)
 {
-#ifdef CONFIG_GENERIC_HARDIRQS
         m68k_setup_user_interrupt(VEC_USER + 96, 16, NULL);
-#else
-        m68k_setup_user_interrupt(VEC_USER + 96, 16, dn_process_int);
-#endif
         m68k_setup_irq_controller(&apollo_irq_chip, handle_fasteoi_irq,
                                   IRQ_APOLLO, 16);
 }