projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../linux-2.6-watchdog-mm
[linux-drm-fsl-dcu.git]
/
arch
/
arm
/
plat-omap
/
gpio.c
diff --git
a/arch/arm/plat-omap/gpio.c
b/arch/arm/plat-omap/gpio.c
index f55f99ae58aea6ab07402c2562ab00b84ff8c38e..8162eed8b500e697938fbc78e90bbb99392cfd24 100644
(file)
--- a/
arch/arm/plat-omap/gpio.c
+++ b/
arch/arm/plat-omap/gpio.c
@@
-783,8
+783,7
@@
void omap_free_gpio(int gpio)
* line's interrupt handler has been run, we may miss some nested
* interrupts.
*/
* line's interrupt handler has been run, we may miss some nested
* interrupts.
*/
-static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc,
- struct pt_regs *regs)
+static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc)
{
void __iomem *isr_reg = NULL;
u32 isr;
{
void __iomem *isr_reg = NULL;
u32 isr;
@@
-882,7
+881,7
@@
static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc,
continue;
}
continue;
}
- desc_handle_irq(gpio_irq, d
, regs
);
+ desc_handle_irq(gpio_irq, d);
if (unlikely((d->status & IRQ_PENDING) && !d->depth)) {
irq_mask = 1 <<
if (unlikely((d->status & IRQ_PENDING) && !d->depth)) {
irq_mask = 1 <<