[ARM] 3699/1: ARM: Convert s3c2410 to generic irq handling

Patch from Thomas Gleixner

From: Thomas Gleixner <[email protected]>

Fixup the conversion to generic irq subsystem.

Signed-off-by: Thomas Gleixner <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Signed-off-by: Russell King <[email protected]>

diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c
index fbbeb05530061eaf24089f3e62acea6d078edad7..def4441d24420e260278672a6fac06160ec46c53 100644 (file)
--- a/arch/arm/mach-s3c2410/bast-irq.c
+++ b/arch/arm/mach-s3c2410/bast-irq.c
@@ -136,8 +136,8 @@ bast_irq_pc104_demux(unsigned int irq,
                for (i = 0; stat != 0; i++, stat >>= 1) {
                        if (stat & 1) {
                                irqno = bast_pc104_irqs[i];
-
-                               desc_handle_irq(irqno, irq_desc + irqno, regs);
+                               desc = irq_desc + irqno;
+                               desc_handle_irq(irqno, desc, regs);
                        }
                }
        }
@@ -156,7 +156,7 @@ static __init int bast_irq_init(void)
 
                set_irq_chained_handler(IRQ_ISA, bast_irq_pc104_demux);
 
-               /* reigster our IRQs */
+               /* register our IRQs */
 
                for (i = 0; i < 4; i++) {
                        unsigned int irqno = bast_pc104_irqs[i];

diff --git a/arch/arm/mach-s3c2410/time.c b/arch/arm/mach-s3c2410/time.c
index 47387c5b97233649cbe7f23451ecf389ecb53be4..c153c49c75dc384b06055c5843c9f959294c87c4 100644 (file)
--- a/arch/arm/mach-s3c2410/time.c
+++ b/arch/arm/mach-s3c2410/time.c
@@ -22,6 +22,7 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/err.h>
 #include <linux/clk.h>