[kernel] r22730 - in dists/trunk/linux/debian/config: . armel kernelarch-powerpc kernelarch-s390 kernelarch-x86

Ian James Campbell ijc at moszumanska.debian.org
Sat Jun 6 10:52:07 UTC 2015 

Author: ijc
Date: Sat Jun  6 10:52:07 2015
New Revision: 22730

Log:
Cleanup deleted, renamed, merged, split or now-automatic, duplicate config

Identified with kconfigeditor2/process.py and verified:

removed:
CONFIG_ARTHUR (arm)
CONFIG_SERIAL_MFD_HSU
CONFIG_PPC_CELLEB
CONFIG_CLAW (s390)
CONFIG_MATHEMU (s390)
CONFIG_MARCH_G5 (s390)
CONFIG_INTEL_MID_DMAC
CONFIG_DIRECT_GBPAGES (x86)

automatic:
CONFIG_DW_DMAC_CORE
CONFIG_64BIT (s390)

merged:
CONFIG_ARM_AT91_ETHER into CONFIG_MACB
CONFIG_HID_HUION into CONFIG_HID_UCLOGIC

split:
CONFIG_TCG_TIS_I2C_ST33 into CONFIG_TCG_TIS_ST33ZP24 and CONFIG_TCG_TIS_ST33ZP24_I2C

duplicate:
CONFIG_SND_SOC_INTEL_BROADWELL_MACH

Modified:
   dists/trunk/linux/debian/config/armel/config.kirkwood
   dists/trunk/linux/debian/config/armel/config.orion5x
   dists/trunk/linux/debian/config/armel/config.versatile
   dists/trunk/linux/debian/config/config
   dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64-be
   dists/trunk/linux/debian/config/kernelarch-s390/config
   dists/trunk/linux/debian/config/kernelarch-s390/config-arch-64
   dists/trunk/linux/debian/config/kernelarch-x86/config
   dists/trunk/linux/debian/config/kernelarch-x86/config-arch-64

Modified: dists/trunk/linux/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.kirkwood	Mon Jun  1 21:09:02 2015	(r22729)
+++ dists/trunk/linux/debian/config/armel/config.kirkwood	Sat Jun  6 10:52:07 2015	(r22730)
@@ -17,7 +17,6 @@
 # CONFIG_FPE_NWFPE_XP is not set
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_VFP is not set
-# CONFIG_ARTHUR is not set
 
 ##
 ## file: arch/arm/Kconfig.debug

Modified: dists/trunk/linux/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.orion5x	Mon Jun  1 21:09:02 2015	(r22729)
+++ dists/trunk/linux/debian/config/armel/config.orion5x	Sat Jun  6 10:52:07 2015	(r22730)
@@ -12,7 +12,6 @@
 # CONFIG_XIP_KERNEL is not set
 CONFIG_ATAGS_PROC=y
 CONFIG_VFP=y
-# CONFIG_ARTHUR is not set
 
 ##
 ## file: arch/arm/mach-imx/Kconfig

Modified: dists/trunk/linux/debian/config/armel/config.versatile
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.versatile	Mon Jun  1 21:09:02 2015	(r22729)
+++ dists/trunk/linux/debian/config/armel/config.versatile	Sat Jun  6 10:52:07 2015	(r22730)
@@ -14,7 +14,6 @@
 # CONFIG_FPE_NWFPE_XP is not set
 # CONFIG_FPE_FASTFPE is not set
 CONFIG_VFP=y
-# CONFIG_ARTHUR is not set
 
 ##
 ## file: arch/arm/Kconfig.debug

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Mon Jun  1 21:09:02 2015	(r22729)
+++ dists/trunk/linux/debian/config/config	Sat Jun  6 10:52:07 2015	(r22730)
@@ -426,7 +426,6 @@
 ##
 ## file: drivers/dma/dw/Kconfig
 ##
-# CONFIG_DW_DMAC_CORE is not set
 # CONFIG_DW_DMAC is not set
 # CONFIG_DW_DMAC_PCI is not set
 
@@ -595,7 +594,6 @@
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
 # CONFIG_HID_GT683R is not set
-CONFIG_HID_HUION=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
@@ -2529,7 +2527,6 @@
 ## file: drivers/net/ethernet/cadence/Kconfig
 ##
 CONFIG_NET_CADENCE=y
-# CONFIG_ARM_AT91_ETHER is not set
 # CONFIG_MACB is not set
 
 ##
@@ -4033,7 +4030,6 @@
 ##
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX310X is not set
-CONFIG_SERIAL_MFD_HSU=m
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_TIMBERDALE is not set

Modified: dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64-be
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64-be	Mon Jun  1 21:09:02 2015	(r22729)
+++ dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64-be	Sat Jun  6 10:52:07 2015	(r22730)
@@ -7,7 +7,6 @@
 ## file: arch/powerpc/platforms/cell/Kconfig
 ##
 CONFIG_PPC_IBM_CELL_BLADE=y
-# CONFIG_PPC_CELLEB is not set
 CONFIG_SPU_FS=m
 CONFIG_SPU_FS_64K_LS=y
 CONFIG_CBE_RAS=y

Modified: dists/trunk/linux/debian/config/kernelarch-s390/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-s390/config	Mon Jun  1 21:09:02 2015	(r22729)
+++ dists/trunk/linux/debian/config/kernelarch-s390/config	Sat Jun  6 10:52:07 2015	(r22730)
@@ -6,7 +6,6 @@
 CONFIG_NR_CPUS=32
 CONFIG_HOTPLUG_CPU=y
 CONFIG_SCHED_TOPOLOGY=y
-CONFIG_MATHEMU=y
 CONFIG_PACK_STACK=y
 # CONFIG_CHECK_STACK is not set
 CONFIG_QDIO=y
@@ -137,7 +136,6 @@
 CONFIG_CTCM=m
 CONFIG_NETIUCV=m
 CONFIG_SMSGIUCV=y
-CONFIG_CLAW=m
 CONFIG_QETH=m
 CONFIG_QETH_L2=m
 CONFIG_QETH_L3=m

Modified: dists/trunk/linux/debian/config/kernelarch-s390/config-arch-64
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-s390/config-arch-64	Mon Jun  1 21:09:02 2015	(r22729)
+++ dists/trunk/linux/debian/config/kernelarch-s390/config-arch-64	Sat Jun  6 10:52:07 2015	(r22730)
@@ -2,13 +2,11 @@
 ## file: arch/s390/Kconfig
 ##
 ## choice: Processor type
-# CONFIG_MARCH_G5 is not set
 CONFIG_MARCH_Z900=y
 # CONFIG_MARCH_Z990 is not set
 # CONFIG_MARCH_Z9_109 is not set
 # CONFIG_MARCH_Z10 is not set
 ## end choice
-CONFIG_64BIT=y
 CONFIG_PCI=y
 
 ##

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Mon Jun  1 21:09:02 2015	(r22729)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Sat Jun  6 10:52:07 2015	(r22730)
@@ -334,10 +334,15 @@
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
-CONFIG_TCG_TIS_I2C_ST33=m
 CONFIG_TCG_XEN=m
 
 ##
+## file: drivers/char/tpm/st33zp24/Kconfig
+##
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
+
+##
 ## file: drivers/cpufreq/Kconfig
 ##
 ## choice: Default CPUFreq governor
@@ -387,7 +392,6 @@
 ## file: drivers/dma/Kconfig
 ##
 CONFIG_DMADEVICES=y
-# CONFIG_INTEL_MID_DMAC is not set
 CONFIG_INTEL_IOATDMA=m
 
 ##
@@ -1917,7 +1921,6 @@
 ##
 CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
-CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
 CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config-arch-64	Mon Jun  1 21:09:02 2015	(r22729)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config-arch-64	Sat Jun  6 10:52:07 2015	(r22730)
@@ -9,7 +9,6 @@
 # CONFIG_MAXSMP is not set
 CONFIG_NR_CPUS=512
 CONFIG_X86_16BIT=y
-CONFIG_DIRECT_GBPAGES=y
 CONFIG_NUMA=y
 CONFIG_AMD_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y

More information about the Kernel-svn-changes mailing list