From a08a6a7b4217f79e5a098e6c1f6a1b67d9da7055 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 1 Jul 2006 22:32:41 +0100 Subject: [PATCH] --- yaml --- r: 31730 b: refs/heads/master c: 418ca1f0a0d3405c5f674d005363ab1ef850c367 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/dma.c | 2 +- trunk/arch/arm/plat-omap/gpio.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6024f765a7f4..4bee2ad60d14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c75c625df7e2395d09a1aa33cdc2212d75928de6 +refs/heads/master: 418ca1f0a0d3405c5f674d005363ab1ef850c367 diff --git a/trunk/arch/arm/plat-omap/dma.c b/trunk/arch/arm/plat-omap/dma.c index 5dac4230360d..2525633fcd09 100644 --- a/trunk/arch/arm/plat-omap/dma.c +++ b/trunk/arch/arm/plat-omap/dma.c @@ -24,9 +24,9 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/trunk/arch/arm/plat-omap/gpio.c b/trunk/arch/arm/plat-omap/gpio.c index 418b88fbea8e..312ace515d17 100644 --- a/trunk/arch/arm/plat-omap/gpio.c +++ b/trunk/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