diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-19 07:56:59 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-19 07:56:59 -0500 |
| commit | db0dd72e27ce62c5b28f07595b91ed00d0565819 (patch) | |
| tree | 912603265aac7ae1fb843c02986dbbb0835b7060 /arch/arm/include/asm/gpio.h | |
| parent | ae3d8b6c403218e68b56bce962ba7737161cc6f4 (diff) | |
| parent | ac7a51c0e48f2aa81ae20caf8d6b9fad976675cd (diff) | |
Merge branch '2021-01-18-assorted-platform-updates'
- Assorted MediaTek, AST2x00 updates
- Assorted driver fixes for various platforms
- Keymile platform updates
- Add pwm command, mp5416 pmic driver
Diffstat (limited to 'arch/arm/include/asm/gpio.h')
| -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 6ecb876eda5..7609367884f 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h @@ -3,7 +3,8 @@ !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_TOTAL_COMPUTE) + !defined(CONFIG_TARGET_BCMNS3) && !defined(CONFIG_TARGET_TOTAL_COMPUTE) && \ + !defined(CONFIG_ARCH_QEMU) #include <asm/arch/gpio.h> #endif #include <asm-generic/gpio.h> |