aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/gpio.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-07-29 14:24:17 -0400
committerTom Rini <trini@konsulko.com>2020-07-29 14:24:17 -0400
commit8da75b1ddf966bd8457a2b5bf59dec0bfc9a1cd6 (patch)
tree41d2ef5d35c09e393409d18fa329848774580592 /arch/arm/include/asm/gpio.h
parent423e08cb77015beab6a81595765ec1faa34bedde (diff)
parent2ae7adc659f7fca9ea65df4318e5bca2b8274310 (diff)
Merge branch '2020-07-29-add-brcm-ns3-support'
- Add initial Broadcom NS3 SoC support.
Diffstat (limited to 'arch/arm/include/asm/gpio.h')
-rw-r--r--arch/arm/include/asm/gpio.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
index 7715a01706..7dc87afb83 100644
--- a/arch/arm/include/asm/gpio.h
+++ b/arch/arm/include/asm/gpio.h
@@ -2,7 +2,8 @@
!defined(CONFIG_ARCH_K3) && !defined(CONFIG_ARCH_BCM68360) && \
!defined(CONFIG_ARCH_BCM6858) && !defined(CONFIG_ARCH_BCM63158) && \
!defined(CONFIG_ARCH_ROCKCHIP) && !defined(CONFIG_ARCH_ASPEED) && \
- !defined(CONFIG_ARCH_U8500) && !defined(CONFIG_CORTINA_PLATFORM)
+ !defined(CONFIG_ARCH_U8500) && !defined(CONFIG_CORTINA_PLATFORM) && \
+ !defined(CONFIG_TARGET_BCMNS3)
#include <asm/arch/gpio.h>
#endif
#include <asm-generic/gpio.h>