diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-03-29 10:16:04 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-03-29 10:16:04 -0700 |
| commit | 2533c2cfbff8f0ee53b8448d6362b54c272125aa (patch) | |
| tree | e254f804f2da2f79e66ea71a1e534574ae9da2ac /arch/arm/mach-omap2/board-omap3evm.c | |
| parent | a2cb960f171228e17a28ff734289be60b75417c7 (diff) | |
| parent | 21235bdb8aa5e8320b08f79525a45185a52b07df (diff) | |
| download | olio-linux-3.10-2533c2cfbff8f0ee53b8448d6362b54c272125aa.tar.xz olio-linux-3.10-2533c2cfbff8f0ee53b8448d6362b54c272125aa.zip | |
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-omap3evm.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index a659e198892..4c90f078abe 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -487,7 +487,6 @@ static struct platform_device omap3evm_wlan_regulator = { }; struct wl12xx_platform_data omap3evm_wlan_data __initdata = { - .irq = OMAP_GPIO_IRQ(OMAP3EVM_WLAN_IRQ_GPIO), .board_ref_clock = WL12XX_REFCLOCK_38, /* 38.4 MHz */ }; #endif @@ -623,6 +622,7 @@ static void __init omap3_evm_wl12xx_init(void) int ret; /* WL12xx WLAN Init */ + omap3evm_wlan_data.irq = gpio_to_irq(OMAP3EVM_WLAN_IRQ_GPIO); ret = wl12xx_set_platform_data(&omap3evm_wlan_data); if (ret) pr_err("error setting wl12xx data: %d\n", ret); |