Merge branch 'fixes-gpio-to-irq' into fixes

Conflicts:
	arch/arm/mach-omap1/board-htcherald.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/plat-omap/include/plat/gpio.h
	drivers/input/serio/ams_delta_serio.c

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
index 11cd2a806093..a2010f07de31 100644
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@ -411,7 +411,6 @@ static struct resource omap_dm9000_resources[] = {
                 .flags          = IORESOURCE_MEM,
         },
         [2] = {
-                .start          = OMAP_GPIO_IRQ(OMAP_DM9000_GPIO_IRQ),
                 .flags          = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
         },
 };
@@ -639,6 +638,7 @@ static void __init devkit8000_init(void)
 
         omap_hsmmc_init(mmc);
         devkit8000_i2c_init();
+        omap_dm9000_resources[2].start = gpio_to_irq(OMAP_DM9000_GPIO_IRQ);
         platform_add_devices(devkit8000_devices,
                         ARRAY_SIZE(devkit8000_devices));