omap_hsmmc.c: Fix build warning on non-omap3
PATCH 1/1 omap_hsmmc.c: Fix build warning on non-omap3
It was incorrect to always include "asm/arch-omap3/mux.h" constantly. This introduced warnings on non-omap3 where certain values will conflict between the various families. Conditionally guard the inclusion in order to correct the problem.
Fixes 6aca17c9b7e8 ("drivers: mmc: omap_hsmmc: Fix IO Buffer on OMAP36xx")
Signed-off-by Tom Rini <[email protected]>
--- drivers/mmc/omap_hsmmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/omap_hsmmc.c +3 -1
@@ -37,8 +37,10 @@#include <asm/gpio.h> #include <asm/arch/sys_proto.h> #endif +#ifdef CONFIG_MMC_OMAP36XX_PINS +#include <asm/arch/mux.h> +#endif #include <dm.h> -#include <asm/arch-omap3/mux.h> DECLARE_GLOBAL_DATA_PTR ;
Signature · 1 line
1.9.1
PATCH 1/1 omap_hsmmc.c: Fix build warning on non-omap3
Quoted 7 lines · Tom Rini
It was incorrect to always include "
asm/arch-omap3/mux.h" constantly. This introduced warnings on non-omap3 where certain values will conflict between the various families. Conditionally guard the inclusion in order to correct the problem.Fixes 6aca17c9b7e8 ("drivers: mmc: omap_hsmmc: Fix IO Buffer on OMAP36xx")Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170209/81869554/attachment.sig>