projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pxa-all' into devel
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
mach-at91
/
gpio.c
diff --git
a/arch/arm/mach-at91/gpio.c
b/arch/arm/mach-at91/gpio.c
index
93e0614
..
7e5ebb5
100644
(file)
--- 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++;