Merge tag 'sunxi-defconfig-for-3.16' of https://github.com/mripard/linux into next/boards · 6ad8f98d22 - Gogs: Go Git Service GfA electronic

Merge tag 'sunxi-defconfig-for-3.16' of https://github.com/mripard/linux into next/boards

Merge "Allwinner defconfig additions for 3.16" from Maxime Ripard.

* tag 'sunxi-defconfig-for-3.16' of https://github.com/mripard/linux:
  ARM: sunxi: drop CONFIG_COMMON_CLK_DEBUG

Signed-off-by: Olof Johansson <olof@lixom.net>

Olof Johansson 11 years ago

parent

0db6542dd4 5659e3bcbc

commit

6ad8f98d22

1 changed files with 0 additions and 1 deletions

Split View Show Diff Stats

						
							+ 0
							
							- 1
						
arch/arm/configs/sunxi_defconfig
							 
								View File
							
				@@ -62,7 +62,6 @@ CONFIG_LEDS_GPIO=y
			
				 CONFIG_LEDS_TRIGGERS=y
			
				 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
			
				 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
			
				-CONFIG_COMMON_CLK_DEBUG=y
			
				 # CONFIG_IOMMU_SUPPORT is not set
			
				 CONFIG_TMPFS=y
			
				 CONFIG_NFS_FS=y