diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-24 20:24:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-25 08:12:05 -0400 |
| commit | 8ee3a24fdc237c76cead618a173740594287dd96 (patch) | |
| tree | a19a58ee49166c02dce5bdb35262bb48c2078e8c /arch/arm/include | |
| parent | 3c0cec035e5b06b638fb52ccd7383bbd5bcede35 (diff) | |
| parent | 3337b291442e31b1db0ff5975f74fec7d9741794 (diff) | |
Merge branch '2020-08-24-misc-improvements'
- Squashfs compression support
- Coverity fixes
- XEN guest updates
- Finish previous MediaTek updates
- Arm Total Compute platform support
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/gpio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index 7dc87afb83..6ecb876eda 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h @@ -3,7 +3,7 @@ !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_TARGET_BCMNS3) + !defined(CONFIG_TARGET_BCMNS3) && !defined(CONFIG_TARGET_TOTAL_COMPUTE) #include <asm/arch/gpio.h> #endif #include <asm-generic/gpio.h> |