diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:32:41 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-07-01 22:32:41 +0100 |
| commit | 418ca1f0a0d3405c5f674d005363ab1ef850c367 (patch) | |
| tree | 9c071049c06187d498df58ee88e6ee8e1e6b7356 /arch/arm | |
| parent | c75c625df7e2395d09a1aa33cdc2212d75928de6 (diff) | |
| download | op-kernel-dev-418ca1f0a0d3405c5f674d005363ab1ef850c367.zip op-kernel-dev-418ca1f0a0d3405c5f674d005363ab1ef850c367.tar.gz | |
[ARM] 3701/1: ARM: Convert plat-omap to generic irq handling
Patch from Thomas Gleixner
From: Thomas Gleixner <tglx@linutronix.de>
Fixup the conversion to generic irq subsystem.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/plat-omap/dma.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/gpio.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 5dac423..2525633 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -24,9 +24,9 @@ #include <linux/spinlock.h> #include <linux/errno.h> #include <linux/interrupt.h> +#include <linux/irq.h> #include <asm/system.h> -#include <asm/irq.h> #include <asm/hardware.h> #include <asm/dma.h> #include <asm/io.h> diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 418b88f..312ace5 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c @@ -738,7 +738,7 @@ static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc, desc->chip->ack(irq); - bank = (struct gpio_bank *) desc->data; + bank = get_irq_data(irq); if (bank->method == METHOD_MPUIO) isr_reg = bank->base + OMAP_MPUIO_GPIO_INT; #ifdef CONFIG_ARCH_OMAP15XX |
