Message ID | 1486739055-17333-6-git-send-email-patrice.chotard@st.com |
---|---|
State | Accepted |
Commit | d4184952320a52e415d4814f1b3144e13ab94b82 |
Delegated to: | Tom Rini |
Headers | show |
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>