Merge tag 'oxnas-arm-soc-for-4.12' of https://github.com/OXNAS/linux into next/fixes-non-critical · d5ac992763 - Gogs: Go Git Service GfA electronic

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

Arnd Bergmann 8 年之前

父節點

c02ed2e75e b44327d198

當前提交

d5ac992763

共有 1 個文件被更改，包括 0 次插入 和 1 次删除

分割檢視顯示文件統計

						
							+ 0
							
							- 1
						
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