diff options
author | ext Anand Gadiyar <gadiyar@ti.com> | 2010-10-01 16:33:26 -0400 |
---|---|---|
committer | Luciano Coelho <luciano.coelho@nokia.com> | 2010-10-05 09:27:58 -0400 |
commit | 4b48e6876b641e1138f37a0fc11fb6a4fc3e24e1 (patch) | |
tree | ef199c1c95d6e6539b100068ec41129f9a131467 /arch | |
parent | 5082b823f3b0c781fdbc52910af579e940f6f18e (diff) |
omap: zoom2/3: fix build caused by wl1271 support
Patch "omap: zoom: add mmc3/wl1271 device support" in the
wireless tree still uses .wires in struct omap2_hsmmc_info.
.wires has now been replaced with .caps in patch "omap: mmc:
extended to pass host capabilities from board file" in the
OMAP tree.
This causes linux-next as of 20101001 build to break as
below. Fix this.
CC arch/arm/mach-omap2/board-zoom-peripherals.o
arch/arm/mach-omap2/board-zoom-peripherals.c:217: error: unknown field 'wires' specified in initializer
make[1]: *** [arch/arm/mach-omap2/board-zoom-peripherals.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Ohad Ben-Cohen <ohad@wizery.com>
Cc: Tony Lindgren <tony@atomide.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
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, |