diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-13 08:27:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-13 08:27:26 -0400 |
| commit | 0a5228be868622894a5f8f226203cd7bac562187 (patch) | |
| tree | 180df0714bcd961c378fb4569cd9b40bd366e5fc /arch/arm/include | |
| parent | 015289580f81733f7358227743e3e5881653a797 (diff) | |
| parent | c3b6c8e2d8fb5b8d0d67858dc4a2133b7065df5b (diff) | |
Merge tag 'mips-pull-2019-04-12' of git://git.denx.de/u-boot-mips
- mt76xx: add USB support, small fixes
- ath79: small fixes, add support for QCA9563 SoC and AP152 reference board
- mscc: small fixes, add network support for JR2 and ServalT SoCs
- bmips: small fixes, enable more drivers for ARM specific BCM6858 and BCM63158 SoCs
- MIPS: fix redundant relocation of initrd images
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/gpio.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index 3039e66bf9..992a84152c 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h @@ -1,5 +1,6 @@ #if !defined(CONFIG_ARCH_UNIPHIER) && !defined(CONFIG_ARCH_STI) && \ - !defined(CONFIG_ARCH_K3) + !defined(CONFIG_ARCH_K3) && !defined(CONFIG_ARCH_BCM6858) && \ + !defined(CONFIG_ARCH_BCM63158) #include <asm/arch/gpio.h> #endif #include <asm-generic/gpio.h> |