Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-apollon.c

diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index c2ef58ae832af4b27e28cf2f6e1d0e530e9fc955..994c9478dd6a8b5b4276f1510c44c74ef6c8c8f5 100644 (file)
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -195,8 +195,8 @@ static struct resource apollon_smc91x_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = gpio_to_irq(APOLLON_ETHR_GPIO_IRQ),
-               .end    = gpio_to_irq(APOLLON_ETHR_GPIO_IRQ),
+               .start  = OMAP_GPIO_IRQ(APOLLON_ETHR_GPIO_IRQ),
+               .end    = OMAP_GPIO_IRQ(APOLLON_ETHR_GPIO_IRQ),
                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
        },
 };