diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 13:53:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 13:59:54 -0400 |
commit | 0cd61b68c340a4f901a06e8bb5e0dea4353161c0 (patch) | |
tree | cfd72be941ecd172627a06dd61d98b55cec63a39 /arch/arm/plat-omap/gpio.c | |
parent | da104a83692cf07434ab3b20bf10093bdbc3f97e (diff) |
Initial blind fixup for arm for irq changes
Untested, but this should fix up the bulk of the totally mechanical
issues, and should make the actual detail fixing easier.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm/plat-omap/gpio.c')
-rw-r--r-- | arch/arm/plat-omap/gpio.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index f55f99ae58ae..8162eed8b500 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c | |||
@@ -783,8 +783,7 @@ void omap_free_gpio(int gpio) | |||
783 | * line's interrupt handler has been run, we may miss some nested | 783 | * line's interrupt handler has been run, we may miss some nested |
784 | * interrupts. | 784 | * interrupts. |
785 | */ | 785 | */ |
786 | static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc, | 786 | static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc) |
787 | struct pt_regs *regs) | ||
788 | { | 787 | { |
789 | void __iomem *isr_reg = NULL; | 788 | void __iomem *isr_reg = NULL; |
790 | u32 isr; | 789 | u32 isr; |
@@ -882,7 +881,7 @@ static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc, | |||
882 | continue; | 881 | continue; |
883 | } | 882 | } |
884 | 883 | ||
885 | desc_handle_irq(gpio_irq, d, regs); | 884 | desc_handle_irq(gpio_irq, d); |
886 | 885 | ||
887 | if (unlikely((d->status & IRQ_PENDING) && !d->depth)) { | 886 | if (unlikely((d->status & IRQ_PENDING) && !d->depth)) { |
888 | irq_mask = 1 << | 887 | irq_mask = 1 << |