Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f968cabc authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: Fix MMC_OMAP build when only MMC_OMAP_HS is selected 



If CONFIG_MMC_OMAP is not set and CONFIG_MMC_OMAP_HS is set,
we can get error: redefinition of `omap242x_init_mmc' error.

Fix it by removing MMC_OMAP_HS from MMC_OMAP ifdefs as they do
not depend on each other.

While at it, also prettify the formatting a bit.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 91930652

arch/arm/plat-omap/include/plat/mmc.h

+1 −3
Original line number Diff line number Diff line
@@ -172,8 +172,7 @@ struct omap_mmc_platform_data { 
extern void omap_mmc_notify_cover_event(struct device *dev, int slot,

					int is_closed);



#if	defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \

	defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)

#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)

void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,

				int nr_controllers);

void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data);
@@ -185,7 +184,6 @@ static inline void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, 
static inline void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data)

{

}



#endif



extern int omap_msdi_reset(struct omap_hwmod *oh);