summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/board-devkit8000.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-03-29 21:16:04 +0400
committerTony Lindgren <tony@atomide.com>2012-03-29 21:16:04 +0400
commit2533c2cfbff8f0ee53b8448d6362b54c272125aa (patch)
treee254f804f2da2f79e66ea71a1e534574ae9da2ac /arch/arm/mach-omap2/board-devkit8000.c
parenta2cb960f171228e17a28ff734289be60b75417c7 (diff)
parent21235bdb8aa5e8320b08f79525a45185a52b07df (diff)
downloadlinux-2533c2cfbff8f0ee53b8448d6362b54c272125aa.tar.xz
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
Diffstat (limited to 'arch/arm/mach-omap2/board-devkit8000.c')
-rw-r--r--arch/arm/mach-omap2/board-devkit8000.c2
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));