[linux] 03/03: Clean up kconfig using kconfigeditor2

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Tue Jan 24 21:06:53 UTC 2017 

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 3479225d0394869a0633d90fafab1919acd53595
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Jan 24 21:03:51 2017 +0000

    Clean up kconfig using kconfigeditor2
    
    Rename or delete options that changed in 4.10.
---
 debian/config/alpha/config                      |  3 +--
 debian/config/armel/config.marvell              |  3 +--
 debian/config/armhf/config                      | 10 +++++---
 debian/config/config                            | 34 +++++++------------------
 debian/config/hppa/config                       |  1 -
 debian/config/i386/config                       |  1 -
 debian/config/kernelarch-mips/config.malta      |  2 +-
 debian/config/kernelarch-mips/config.octeon     |  2 +-
 debian/config/kernelarch-powerpc/config         |  2 +-
 debian/config/kernelarch-powerpc/config-arch-64 |  2 +-
 debian/config/kernelarch-x86/config             | 20 ++++++---------
 debian/config/m68k/config                       |  5 ----
 12 files changed, 30 insertions(+), 55 deletions(-)

diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index 144e307..25e0e41 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -395,7 +395,7 @@ CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 
 ##
-## file: drivers/mmc/card/Kconfig
+## file: drivers/mmc/core/Kconfig
 ##
 CONFIG_MMC_BLOCK=m
 
@@ -766,7 +766,6 @@ CONFIG_SCSI_EATA_MAX_TAGS=16
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_GENERIC_NCR5380=m
-CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index 4a80506..121a9b3 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -63,7 +63,6 @@ CONFIG_MACH_KUROBOX_PRO=y
 CONFIG_MACH_TS209=y
 CONFIG_MACH_TERASTATION_PRO2=y
 CONFIG_MACH_LINKSTATION_PRO=y
-CONFIG_MACH_LINKSTATION_LSCHL=y
 CONFIG_MACH_LINKSTATION_MINI=y
 CONFIG_MACH_LINKSTATION_LS_HGL=y
 CONFIG_MACH_TS409=y
@@ -322,7 +321,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_MMC=m
 
 ##
-## file: drivers/mmc/card/Kconfig
+## file: drivers/mmc/core/Kconfig
 ##
 CONFIG_MMC_BLOCK=m
 
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 5512b03..da6ec2d 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -75,6 +75,13 @@ CONFIG_MACH_ARMADA_39X=y
 CONFIG_MACH_ARMADA_XP=y
 
 ##
+## file: arch/arm/mach-omap1/Kconfig
+##
+CONFIG_OMAP_MUX=y
+# CONFIG_OMAP_MUX_DEBUG is not set
+CONFIG_OMAP_MUX_WARNINGS=y
+
+##
 ## file: arch/arm/mach-omap2/Kconfig
 ##
 # CONFIG_ARCH_OMAP2 is not set
@@ -129,9 +136,6 @@ CONFIG_ARM_THUMBEE=y
 CONFIG_POWER_AVS_OMAP=y
 CONFIG_POWER_AVS_OMAP_CLASS3=y
 CONFIG_OMAP_RESET_CLOCKS=y
-CONFIG_OMAP_MUX=y
-# CONFIG_OMAP_MUX_DEBUG is not set
-CONFIG_OMAP_MUX_WARNINGS=y
 # CONFIG_OMAP_MPU_TIMER is not set
 CONFIG_OMAP_32K_TIMER=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
diff --git a/debian/config/config b/debian/config/config
index bd87c7f..51f4005 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -292,7 +292,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_FENCE_TRACE is not set
+# CONFIG_DMA_FENCE_TRACE is not set
 
 ##
 ## file: drivers/bcma/Kconfig
@@ -932,11 +932,6 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_BLK_DEV_IT821X is not set
 
 ##
-## file: drivers/idle/Kconfig
-##
-CONFIG_I7300_IDLE=m
-
-##
 ## file: drivers/iio/Kconfig
 ##
 CONFIG_IIO=m
@@ -956,6 +951,7 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_MXC4005 is not set
+# CONFIG_SCA3000 is not set
 # CONFIG_STK8312 is not set
 # CONFIG_STK8BA50 is not set
 
@@ -1100,6 +1096,7 @@ CONFIG_HID_SENSOR_PROX=m
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
 # CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_TSL2583 is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_US5182D is not set
 # CONFIG_VCNL4000 is not set
@@ -2523,7 +2520,7 @@ CONFIG_SENSORS_LIS3_I2C=m
 # CONFIG_TI_ST is not set
 
 ##
-## file: drivers/mmc/card/Kconfig
+## file: drivers/mmc/core/Kconfig
 ##
 CONFIG_MMC_BLOCK_MINORS=256
 CONFIG_MMC_BLOCK_BOUNCE=y
@@ -2769,6 +2766,11 @@ CONFIG_NET_VENDOR_AGERE=y
 CONFIG_ET131X=m
 
 ##
+## file: drivers/net/ethernet/alacritech/Kconfig
+##
+# CONFIG_SLICOSS is not set
+
+##
 ## file: drivers/net/ethernet/alteon/Kconfig
 ##
 CONFIG_NET_VENDOR_ALTEON=y
@@ -3887,11 +3889,6 @@ CONFIG_PTP_1588_CLOCK_IXP46X=m
 # CONFIG_REGULATOR is not set
 
 ##
-## file: drivers/remoteproc/Kconfig
-##
-# CONFIG_STE_MODEM_RPROC is not set
-
-##
 ## file: drivers/reset/Kconfig
 ##
 # CONFIG_RESET_CONTROLLER is not set
@@ -4258,7 +4255,6 @@ CONFIG_STAGING=y
 # CONFIG_ADIS16203 is not set
 # CONFIG_ADIS16209 is not set
 # CONFIG_ADIS16240 is not set
-# CONFIG_SCA3000 is not set
 
 ##
 ## file: drivers/staging/iio/adc/Kconfig
@@ -4301,7 +4297,6 @@ CONFIG_STAGING=y
 ## file: drivers/staging/iio/light/Kconfig
 ##
 # CONFIG_SENSORS_ISL29028 is not set
-# CONFIG_TSL2583 is not set
 # CONFIG_TSL2x7x is not set
 
 ##
@@ -4383,11 +4378,6 @@ CONFIG_R8712U=m
 # CONFIG_CRYPTO_SKEIN is not set
 
 ##
-## file: drivers/staging/slicoss/Kconfig
-##
-# CONFIG_SLICOSS is not set
-
-##
 ## file: drivers/staging/sm750fb/Kconfig
 ##
 # CONFIG_FB_SM750 is not set
@@ -5276,11 +5266,6 @@ CONFIG_JFS_SECURITY=y
 # CONFIG_JFS_STATISTICS is not set
 
 ##
-## file: fs/logfs/Kconfig
-##
-CONFIG_LOGFS=m
-
-##
 ## file: fs/minix/Kconfig
 ##
 CONFIG_MINIX_FS=m
@@ -5837,7 +5822,6 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 #. For use by selftests
 CONFIG_NOTIFIER_ERROR_INJECTION=m
-CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
 CONFIG_PM_NOTIFIER_ERROR_INJECT=m
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index dafc021..fcd63f1 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -432,7 +432,6 @@ CONFIG_RTC_DRV_GENERIC=y
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_GDTH is not set
 # CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
 # CONFIG_SCSI_IPS is not set
 CONFIG_SCSI_INITIO=m
 # CONFIG_SCSI_INIA100 is not set
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 736ab72..af873f7 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -358,7 +358,6 @@ CONFIG_PNPBIOS=y
 ##
 CONFIG_SCSI_EATA_PIO=m
 # CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
 # CONFIG_SCSI_INIA100 is not set
 CONFIG_SCSI_NCR53C406A=m
 CONFIG_SCSI_QLOGIC_FAS=m
diff --git a/debian/config/kernelarch-mips/config.malta b/debian/config/kernelarch-mips/config.malta
index c079ae5..cf02165 100644
--- a/debian/config/kernelarch-mips/config.malta
+++ b/debian/config/kernelarch-mips/config.malta
@@ -150,7 +150,7 @@ CONFIG_MFD_SM501=m
 CONFIG_MMC=m
 
 ##
-## file: drivers/mmc/card/Kconfig
+## file: drivers/mmc/core/Kconfig
 ##
 CONFIG_MMC_BLOCK=m
 
diff --git a/debian/config/kernelarch-mips/config.octeon b/debian/config/kernelarch-mips/config.octeon
index f889f9e..0c24437 100644
--- a/debian/config/kernelarch-mips/config.octeon
+++ b/debian/config/kernelarch-mips/config.octeon
@@ -91,7 +91,7 @@ CONFIG_I2C_OCTEON=y
 CONFIG_MMC=m
 
 ##
-## file: drivers/mmc/card/Kconfig
+## file: drivers/mmc/core/Kconfig
 ##
 CONFIG_MMC_BLOCK=m
 
diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config
index d78f469..7bdedef 100644
--- a/debian/config/kernelarch-powerpc/config
+++ b/debian/config/kernelarch-powerpc/config
@@ -411,7 +411,7 @@ CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 
 ##
-## file: drivers/mmc/card/Kconfig
+## file: drivers/mmc/core/Kconfig
 ##
 CONFIG_MMC_BLOCK=m
 
diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64
index 0bd0fa2..fe7a967 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64
+++ b/debian/config/kernelarch-powerpc/config-arch-64
@@ -24,7 +24,6 @@ CONFIG_KVM_XICS=y
 ##
 CONFIG_RTAS_PROC=y
 CONFIG_RTAS_FLASH=m
-CONFIG_IBMEBUS=y
 
 ##
 ## file: arch/powerpc/platforms/Kconfig.cputype
@@ -46,6 +45,7 @@ CONFIG_PPC_PSERIES=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_SCANLOG=m
 # CONFIG_LPARCFG is not set
+CONFIG_IBMEBUS=y
 
 ##
 ## file: block/partitions/Kconfig
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 3a87783..c42886b 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -535,7 +535,7 @@ CONFIG_DRM_I2C_SIL164=m
 ## file: drivers/gpu/drm/i915/Kconfig
 ##
 CONFIG_DRM_I915=m
-# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
+# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
 
 ##
 ## file: drivers/gpu/drm/mgag200/Kconfig
@@ -698,9 +698,13 @@ CONFIG_INV_MPU6050_I2C=m
 ##
 ## file: drivers/iio/light/Kconfig
 ##
+#. Samsung Series 5 550, Chromebook Pixel
+CONFIG_SENSORS_ISL29018=m
 CONFIG_JSA1212=m
 #. Cr-48, Acer AC700
 CONFIG_SENSORS_TSL2563=m
+#. Samsung Series 5
+CONFIG_TSL2583=m
 
 ##
 ## file: drivers/iio/magnetometer/Kconfig
@@ -865,6 +869,8 @@ CONFIG_IR_ITE_CIR=m
 CONFIG_IR_FINTEK=m
 CONFIG_IR_NUVOTON=m
 CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_SERIAL=m
+CONFIG_IR_SERIAL_TRANSMITTER=y
 
 ##
 ## file: drivers/media/tuners/Kconfig
@@ -926,7 +932,7 @@ CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 
 ##
-## file: drivers/mmc/card/Kconfig
+## file: drivers/mmc/core/Kconfig
 ##
 CONFIG_MMC_BLOCK=m
 
@@ -1564,14 +1570,6 @@ CONFIG_COMEDI_8255_SA=m
 CONFIG_COMEDI_KCOMEDILIB=m
 
 ##
-## file: drivers/staging/iio/light/Kconfig
-##
-#. Samsung Series 5 550, Chromebook Pixel
-CONFIG_SENSORS_ISL29018=m
-#. Samsung Series 5
-CONFIG_TSL2583=m
-
-##
 ## file: drivers/staging/lustre/lnet/Kconfig
 ##
 CONFIG_LNET=m
@@ -1603,8 +1601,6 @@ CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SERIAL=m
-CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
 CONFIG_LIRC_ZILOG=m
 
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index 6e53eb3..b893621 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -676,11 +676,6 @@ CONFIG_BINFMT_MISC=m
 # CONFIG_JFS_FS is not set
 
 ##
-## file: fs/logfs/Kconfig
-##
-# CONFIG_LOGFS is not set
-
-##
 ## file: fs/ntfs/Kconfig
 ##
 # CONFIG_NTFS_FS is not set

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git

More information about the Kernel-svn-changes mailing list