diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-12 16:45:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-12 16:45:41 -0400 |
| commit | 37b0d1dedcedf555e2940bc7702c11e2b572299f (patch) | |
| tree | ce0b69ccd8f147d5eb7c4d75d45dbb67b4a4ff0a /arch/arm/mach-imx/irq.c | |
| parent | d374c1c1281d6188a0d0676172b1c0e3de35c6e7 (diff) | |
| parent | 56f1319e877a969b814b3805c77ea9c31d849f54 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Fix Integrator and Versatile interrupt initialisation
[ARM] 3546/1: PATCH: subtle lost interrupts bug on i.MX
[ARM] 3547/1: PXA-OHCI: Allow platforms to specify a power budget
[ARM] Fix Neponset IRQ handling
Diffstat (limited to 'arch/arm/mach-imx/irq.c')
| -rw-r--r-- | arch/arm/mach-imx/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c index eeb8a6d4a399..a5de5f1da9f2 100644 --- a/arch/arm/mach-imx/irq.c +++ b/arch/arm/mach-imx/irq.c | |||
| @@ -127,7 +127,7 @@ static void | |||
| 127 | imx_gpio_ack_irq(unsigned int irq) | 127 | imx_gpio_ack_irq(unsigned int irq) |
| 128 | { | 128 | { |
| 129 | DEBUG_IRQ("%s: irq %d\n", __FUNCTION__, irq); | 129 | DEBUG_IRQ("%s: irq %d\n", __FUNCTION__, irq); |
| 130 | ISR(IRQ_TO_REG(irq)) |= 1 << ((irq - IRQ_GPIOA(0)) % 32); | 130 | ISR(IRQ_TO_REG(irq)) = 1 << ((irq - IRQ_GPIOA(0)) % 32); |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | static void | 133 | static void |