diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:33:02 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:33:02 -0400 |
| commit | 3f30a09a612bac2b531a206c2a58a292dd7ff182 (patch) | |
| tree | 62741c2f78aeb3009c66dbcf014ebff2e034e597 /arch/arm/mach-s3c2410/bast-irq.c | |
| parent | 9e165acf1b9e37af7c0fa39399b43d0bd8600039 (diff) | |
| parent | fda50a1c49ad7483eaa29a268d560422c413933f (diff) | |
Merge branch 'pxa-all' into devel
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'arch/arm/mach-s3c2410/bast-irq.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/bast-irq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c index 604224a2d9a6..75738000272b 100644 --- a/arch/arm/mach-s3c2410/bast-irq.c +++ b/arch/arm/mach-s3c2410/bast-irq.c | |||
| @@ -130,8 +130,7 @@ bast_irq_pc104_demux(unsigned int irq, | |||
| 130 | for (i = 0; stat != 0; i++, stat >>= 1) { | 130 | for (i = 0; stat != 0; i++, stat >>= 1) { |
| 131 | if (stat & 1) { | 131 | if (stat & 1) { |
| 132 | irqno = bast_pc104_irqs[i]; | 132 | irqno = bast_pc104_irqs[i]; |
| 133 | desc = irq_desc + irqno; | 133 | generic_handle_irq(irqno); |
| 134 | desc_handle_irq(irqno, desc); | ||
| 135 | } | 134 | } |
| 136 | } | 135 | } |
| 137 | } | 136 | } |