Message ID | 1487083137-30467-6-git-send-email-patrice.chotard@st.com |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show |
On 14 February 2017 at 07:38, <patrice.chotard@st.com> wrote: > 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(-) Reviewed-by: Simon Glass <sjg@chromium.org>
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>