diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-07 19:04:23 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-07 19:04:23 -0500 |
| commit | e1dff2d69e5a21a61c3eb28e5d230a6d48749b6c (patch) | |
| tree | ad59579dca2cf8f166390d0a65bca7ea7b7610cb /arch/arm/include/asm | |
| parent | 96ff825d31ae9a1410600f002731047c3c2de8b1 (diff) | |
| parent | 7d706a886fdd99e76a1123a8fefbe060fd11bebb (diff) | |
Merge branch '2020-02-07-master-imports'
- 2 FAT fixes.
- MediaTek ethernet support improvement.
- Initial Cortina Access CAxxxx family support.
- Correct return value of do_gpio() and so gpio shell command.
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/gpio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index 39ffc18e29..84e5cb46e5 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h @@ -4,8 +4,8 @@ !defined(CONFIG_ARCH_ROCKCHIP) && !defined(CONFIG_ARCH_LX2160A) && \ !defined(CONFIG_ARCH_LS1028A) && !defined(CONFIG_ARCH_LS2080A) && \ !defined(CONFIG_ARCH_LS1088A) && !defined(CONFIG_ARCH_ASPEED) && \ - !defined(CONFIG_ARCH_LS1012A) && \ - !defined(CONFIG_ARCH_U8500) + !defined(CONFIG_ARCH_LS1012A) && !defined(CONFIG_ARCH_U8500) && \ + !defined(CONFIG_CORTINA_PLATFORM) #include <asm/arch/gpio.h> #endif #include <asm-generic/gpio.h> |