diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-14 21:22:22 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-14 21:22:22 +0300 |
| commit | 05f689400ea5fa3d71af82f910c8b140f87ad1f3 (patch) | |
| tree | 39fa8ddb5163661361dbc5b2ab11f4e331492ead /arch/arm/mach-omap2/board-zoom.c | |
| parent | 17fe12c5a7bd674c1e6dca9cf1e250f9cd7b96b1 (diff) | |
| parent | 02b7b94ee98a0a463195d148e5c5885a218ee16f (diff) | |
| download | linux-05f689400ea5fa3d71af82f910c8b140f87ad1f3.tar.xz | |
Merge branches 'devel-mux' and 'devel-misc' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-zoom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c index 7e3f1595d77b..7e895ff39220 100644 --- a/arch/arm/mach-omap2/board-zoom.c +++ b/arch/arm/mach-omap2/board-zoom.c @@ -48,7 +48,7 @@ static void __init omap_zoom_init_early(void) #ifdef CONFIG_OMAP_MUX static struct omap_board_mux board_mux[] __initdata = { /* WLAN IRQ - GPIO 162 */ - OMAP3_MUX(MCBSP1_CLKX, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP), + OMAP3_MUX(MCBSP1_CLKX, OMAP_MUX_MODE4 | OMAP_PIN_INPUT), /* WLAN POWER ENABLE - GPIO 101 */ OMAP3_MUX(CAM_D2, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT), /* WLAN SDIO: MMC3 CMD */ |