summaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
authorPatrice Chotard <patrice.chotard@st.com>2017-02-21 13:37:08 +0100
committerTom Rini <trini@konsulko.com>2017-03-14 20:40:19 -0400
commitd4184952320a52e415d4814f1b3144e13ab94b82 (patch)
tree51888a92202bc211370b14503081b23a26ea8182 /arch/arm/include
parent214a17e61dac5513fef4e8f5c784d02dc44e2617 (diff)
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>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/gpio.h2
1 files changed, 1 insertions, 1 deletions
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>