diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-20 09:50:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-20 09:50:21 -0700 |
| commit | 00c04db982b66fe9e8c8c5156808b905199bd645 (patch) | |
| tree | d394c01dceffe37a6f67cccfc2e87a64aad7740a /arch/arm/plat-omap/gpio.c | |
| parent | 6a25a6c175bfbb4ddc879ca3070ecaacf58b1a34 (diff) | |
| parent | 2a1bf8b7da2736d85d683fb921ac9a6b71719f37 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4872/1: Replaces buggy macro in S3C2410 irq include
[ARM] 4870/1: fix signal return code when enable CONFIG_OABI_COMPAT
[ARM] 4869/1: ARM: OMAP: Fix compile for mcbsp
[ARM] 4865/1: Register the F75375 device in the GLAN Tank platform code
[ARM] 4864/1: Enable write buffer coalescing on IOP
[ARM] 4863/1: AT91: CAP9 USART definitions for early debug
[ARM] 4861/1: AT91: Update maintainer email address (again)
ARM: OMAP1: Fix typo in OMAP1 MPU clock source initialization
ARM: OMAP: Fix DMA CLINK mask, clear spurious interrupt
ARM: OMAP: Fix chain_a_transfer return value
ARM: OMAP: Fix missing makefile options
ARM: OMAP: Fix GPIO IRQ unmask
ARM: OMAP: Fix clockevent support for hrtimers
Diffstat (limited to 'arch/arm/plat-omap/gpio.c')
| -rw-r--r-- | arch/arm/plat-omap/gpio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 66a1455595f4..8c78e4e57b5c 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c @@ -1134,10 +1134,9 @@ static void gpio_mask_irq(unsigned int irq) static void gpio_unmask_irq(unsigned int irq) { unsigned int gpio = irq - IH_GPIO_BASE; - unsigned int gpio_idx = get_gpio_index(gpio); struct gpio_bank *bank = get_irq_chip_data(irq); - _set_gpio_irqenable(bank, gpio_idx, 1); + _set_gpio_irqenable(bank, gpio, 1); } static struct irq_chip gpio_irq_chip = { |