diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-13 20:28:05 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-13 20:28:05 -0400 |
| commit | db9ca5803566078aafe63cf364ef98b5097e4194 (patch) | |
| tree | ce330cdf21728f00801004e3900c79e4195cd516 /arch/arm/mach-imx/irq.c | |
| parent | bf717b11aec20965d48dea36dea3eea18a75d18c (diff) | |
| parent | eb35cf60e462491249166182e3e755d3d5d91a28 (diff) | |
Merge branch 'master' into upstream
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 |