From: Ming Lei <tom.leim...@gmail.com>
The instance of omap_mmc_platform_data is alwasy passed to
mmc omap host driver from board, so remove ifdef in omap_mmc_platform_data
defination to simplify handling it in mmc omap host driver.
The patch fixes the compile error below:
drivers/mmc/host/omap.c: In function 'mmc_omap_new_slot':
drivers/mmc/host/omap.c:1320: error: 'struct omap_mmc_slot_data' has no member
named 'wires'
make[3]: *** [drivers/mmc/host/omap.o] Error 1
make[2]: *** [drivers/mmc/host] Error 2
make[1]: *** [drivers/mmc] Error 2
make: *** [drivers] Error 2
Signed-off-by: Ming Lei <tom.leim...@gmail.com>
---
arch/arm/plat-omap/include/plat/mmc.h | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/mmc.h
b/arch/arm/plat-omap/include/plat/mmc.h
index 3107892..f57f36a 100644
--- a/arch/arm/plat-omap/include/plat/mmc.h
+++ b/arch/arm/plat-omap/include/plat/mmc.h
@@ -80,12 +80,8 @@ struct omap_mmc_platform_data {
* 4/8 wires and any additional host capabilities
* need to OR'd all capabilities (ref. linux/mmc/host.h)
*/
-#if defined(CONFIG_ARCH_OMAP1) || defined(CONFIG_ARCH_OMAP2420)
u8 wires; /* Used for the MMC driver on omap1 and 2420 */
-#endif
-#ifdef CONFIG_ARCH_OMAP2PLUS
u32 caps; /* Used for the MMC driver on 2430 and later */
-#endif
/*
* nomux means "standard" muxing is wrong on this board, and
--
1.7.3
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
