]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
omap_hsmmc.c: Fix build warning on non-omap3
authorTom Rini <trini@konsulko.com>
Thu, 9 Feb 2017 18:41:28 +0000 (13:41 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 9 Feb 2017 18:41:28 +0000 (13:41 -0500)
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 <trini@konsulko.com>
drivers/mmc/omap_hsmmc.c

index b63ce565f2bf0b5aec21c40e898335ae3918e373..7ed532843bca8f859546078397a1d32a18006038 100644 (file)
 #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;