diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-03-30 17:00:34 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-03-30 17:00:34 +0200 |
| commit | d5ac992763d8de6c0ad6069df53a42f32a34c8b4 (patch) | |
| tree | 0a7f9925172796d0a02b9722b4dc79316c99f20b | |
| parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) | |
| parent | b44327d198b4f1bbebaf83f714cde450471de644 (diff) | |
Merge tag 'oxnas-arm-soc-for-4.12' of https://github.com/OXNAS/linux into next/fixes-non-critical
Pull "ARM: OXNAS SoC update for 4.12" from Neil Armstrong:
- Fix OX820 Kconfig
* tag 'oxnas-arm-soc-for-4.12' of https://github.com/OXNAS/linux:
ARM: oxnas: remove redundant select CPU_V6K
| -rw-r--r-- | arch/arm/mach-oxnas/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-oxnas/Kconfig b/arch/arm/mach-oxnas/Kconfig index 8fa4557e27a9..e3610c5b309b 100644 --- a/arch/arm/mach-oxnas/Kconfig +++ b/arch/arm/mach-oxnas/Kconfig @@ -28,7 +28,6 @@ config MACH_OX820 depends on ARCH_MULTI_V6 select ARM_GIC select DMA_CACHE_RWFO if SMP - select CPU_V6K select HAVE_SMP select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP |