From: Tom Rini <trini@konsulko.com>
Date: Thu, 9 Feb 2017 18:41:28 +0000 (-0500)
Subject: omap_hsmmc.c: Fix build warning on non-omap3
X-Git-Tag: v2017.03-rc2~9
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2a48b3a2c4ec0f1775deeac5cfe7e61072b6b894;p=u-boot

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 <trini@konsulko.com>
---

diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index b63ce565f2..7ed532843b 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -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;