diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-08 16:51:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-08 16:51:11 -0400 |
| commit | 9cf8d1a3b8cb19fa49494c1b8f0f9e3a37f2c218 (patch) | |
| tree | 0e9262488832ad27f6ba42680bf104872fa3c697 /arch | |
| parent | 8391d07b80e8da957cd888870e23f8e218438622 (diff) | |
| parent | e9a68707d736f4f73d7e209885d7b4c5c452b1dc (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'arch')
| -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 = { | |||
| 213 | { | 213 | { |
| 214 | .name = "wl1271", | 214 | .name = "wl1271", |
| 215 | .mmc = 3, | 215 | .mmc = 3, |
| 216 | .wires = 4, | 216 | .caps = MMC_CAP_4_BIT_DATA, |
| 217 | .gpio_wp = -EINVAL, | 217 | .gpio_wp = -EINVAL, |
| 218 | .gpio_cd = -EINVAL, | 218 | .gpio_cd = -EINVAL, |
| 219 | .nonremovable = true, | 219 | .nonremovable = true, |