From: Patrice Chotard <patrice.chotard@st.com>
Date: Tue, 21 Feb 2017 12:37:08 +0000 (+0100)
Subject: gpio: do not include <asm/arch/gpio.h> for ARCH_STI
X-Git-Tag: v2017.05-rc1~85
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d4184952320a52e415d4814f1b3144e13ab94b82;p=u-boot

gpio: do not include <asm/arch/gpio.h> for ARCH_STI

As no gpio.h is defined in arch/arm/include/asm/arch-stih410,
to avoid compilation failure, do not include asm/arch/gpio.h.

This is needed for example when including sdhci.h, which include
asm/gpio.h>.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
index fe4419cae4..1c5e87340c 100644
--- a/arch/arm/include/asm/gpio.h
+++ b/arch/arm/include/asm/gpio.h
@@ -1,4 +1,4 @@
-#ifndef CONFIG_ARCH_UNIPHIER
+#if !defined(CONFIG_ARCH_UNIPHIER) && !defined(CONFIG_ARCH_STI)
 #include <asm/arch/gpio.h>
 #endif
 #include <asm-generic/gpio.h>