Commit d5ac9927 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents c02ed2e7 b44327d1

arch/arm/mach-oxnas/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE