summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorext Anand Gadiyar <gadiyar@ti.com>2010-10-01 22:33:26 +0200
committerLuciano Coelho <luciano.coelho@nokia.com>2010-10-05 16:27:58 +0300
commit4b48e6876b641e1138f37a0fc11fb6a4fc3e24e1 (patch)
treeef199c1c95d6e6539b100068ec41129f9a131467
parent5082b823f3b0c781fdbc52910af579e940f6f18e (diff)
downloadop-kernel-dev-4b48e6876b641e1138f37a0fc11fb6a4fc3e24e1.zip
op-kernel-dev-4b48e6876b641e1138f37a0fc11fb6a4fc3e24e1.tar.gz
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>
-rw-r--r--arch/arm/mach-omap2/board-zoom-peripherals.c2
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 6aa0728..189a6d1 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,
OpenPOWER on IntegriCloud