
14 Feb
2017
14 Feb
'17
3:38 p.m.
From: Patrice Chotard patrice.chotard@st.com
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 --- arch/arm/include/asm/gpio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index fe4419c..1c5e873 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>
--
1.9.1