1 files changed, 3 insertions, 6 deletions

diff --git a/arch/arm/mach-s3c2440/irq.c b/arch/arm/mach-s3c2440/irq.c
index 276b823f4e27..33e3ede0a2b3 100644
--- a/arch/arm/mach-s3c2440/irq.c
+++ b/arch/arm/mach-s3c2440/irq.c
@@ -24,10 +24,10 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/sysdev.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
-#include <asm/io.h>
 
 #include <asm/mach/irq.h>
 
@@ -44,7 +44,6 @@ static void s3c_irq_demux_wdtac97(unsigned int irq,
                                   struct irq_desc *desc)
 {
         unsigned int subsrc, submsk;
-        struct irq_desc *mydesc;
 
         /* read the current pending interrupts, and the mask
          * for what it is available */
@@ -58,12 +57,10 @@ static void s3c_irq_demux_wdtac97(unsigned int irq,
 
         if (subsrc != 0) {
                 if (subsrc & 1) {
-                        mydesc = irq_desc + IRQ_S3C2440_WDT;
-                        desc_handle_irq(IRQ_S3C2440_WDT, mydesc);
+                        generic_handle_irq(IRQ_S3C2440_WDT);
                 }
                 if (subsrc & 2) {
-                        mydesc = irq_desc + IRQ_S3C2440_AC97;
-                        desc_handle_irq(IRQ_S3C2440_AC97, mydesc);
+                        generic_handle_irq(IRQ_S3C2440_AC97);
                 }
         }
 }