diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-08 22:51:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-08 22:51:11 +0200 |
| commit | 9cf8d1a3b8cb19fa49494c1b8f0f9e3a37f2c218 (patch) | |
| tree | 0e9262488832ad27f6ba42680bf104872fa3c697 /arch/arm | |
| parent | ipv4: Remove leftover rcu_read_unlock calls from __mkroute_output() (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-9cf8d1a3b8cb19fa49494c1b8f0f9e3a37f2c218.tar.xz linux-9cf8d1a3b8cb19fa49494c1b8f0f9e3a37f2c218.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/board-zoom-peripherals.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index 6aa0728fa15d..189a6d1600b2 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -213,7 +213,7 @@ static struct omap2_hsmmc_info mmc[] __initdata = { { .name = "wl1271", .mmc = 3, - .wires = 4, + .caps = MMC_CAP_4_BIT_DATA, .gpio_wp = -EINVAL, .gpio_cd = -EINVAL, .nonremovable = true, |