diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 23:32:39 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-07-01 23:32:39 +0200 |
| commit | 544b46de259c8be67c042bcdfaf81f0bc6fa2e6d (patch) | |
| tree | 051583ef7e10dad59030ca56e86a4d5a54d1a27e | |
| parent | [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling (diff) | |
| download | linux-544b46de259c8be67c042bcdfaf81f0bc6fa2e6d.tar.xz linux-544b46de259c8be67c042bcdfaf81f0bc6fa2e6d.zip | |
[ARM] 3699/1: ARM: Convert s3c2410 to generic irq handling
Patch from Thomas Gleixner
From: Thomas Gleixner <tglx@linutronix.de>
Fixup the conversion to generic irq subsystem.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-s3c2410/bast-irq.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2410/time.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c index fbbeb0553006..def4441d2442 100644 --- 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 47387c5b9723..c153c49c75dc 100644 --- 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> |