projects / platform / kernel / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 214a17e)
gpio: do not include <asm/arch/gpio.h> for ARCH_STI
authorPatrice Chotard <patrice.chotard@st.com>
Tue, 21 Feb 2017 12:37:08 +0000 (13:37 +0100)
committerTom Rini <trini@konsulko.com>
Wed, 15 Mar 2017 00:40:19 +0000 (20:40 -0400)
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>
arch/arm/include/asm/gpio.h patch | blob | history

diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
index fe4419c..1c5e873 100644 (file)
--- 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>
Domain: System / Kernel;