* Anand Gadiyar <gadiyar@xxxxxx> [101001 13:25]:
> 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
Can you guys please queue this via the wireless tree along with
the other wl1271 patches?
Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
> Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx>
> Cc: Ohad Ben-Cohen <ohad@xxxxxxxxxx>
> Cc: Tony Lindgren <tony@xxxxxxxxxxx>
> ---
> arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-2.6/arch/arm/mach-omap2/board-zoom-peripherals.c
> ===================================================================
> --- linux-2.6.orig/arch/arm/mach-omap2/board-zoom-peripherals.c
> +++ linux-2.6/arch/arm/mach-omap2/board-zoom-peripherals.c
> @@ -214,7 +214,7 @@ static struct omap2_hsmmc_info mmc[] __i
> {
> .name = "wl1271",
> .mmc = 3,
> - .wires = 4,
> + .caps = MMC_CAP_4_BIT_DATA,
> .gpio_wp = -EINVAL,
> .gpio_cd = -EINVAL,
> .nonremovable = true,
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
