diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 22:33:02 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 22:33:02 +0200 |
| commit | 3f30a09a612bac2b531a206c2a58a292dd7ff182 (patch) | |
| tree | 62741c2f78aeb3009c66dbcf014ebff2e034e597 /arch/arm/mach-at91 | |
| parent | Merge branch 'at91' into devel (diff) | |
| parent | [ARM] 5239/1: Palm Zire 72 power management support (diff) | |
| download | linux-3f30a09a612bac2b531a206c2a58a292dd7ff182.tar.xz linux-3f30a09a612bac2b531a206c2a58a292dd7ff182.zip | |
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-at91')
| -rw-r--r-- | arch/arm/mach-at91/gpio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c index 93e0614f2afb..7e5ebb5bdd17 100644 --- a/arch/arm/mach-at91/gpio.c +++ b/arch/arm/mach-at91/gpio.c @@ -404,7 +404,6 @@ static void gpio_irq_handler(unsigned irq, struct irq_desc *desc) } pin = bank->chipbase; - gpio = &irq_desc[pin]; while (isr) { if (isr & 1) { @@ -417,7 +416,7 @@ static void gpio_irq_handler(unsigned irq, struct irq_desc *desc) gpio_irq_mask(pin); } else - desc_handle_irq(pin, gpio); + generic_handle_irq(pin); } pin++; gpio++; |