Clean up kconfig using kconfigeditor2

Rename or delete options that changed in 4.10.
This commit is contained in:
Ben Hutchings 2017-01-24 21:03:51 +00:00
parent 601b9e92a1
commit 3479225d03
12 changed files with 30 additions and 55 deletions

View File

@ -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

View File

@ -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

View File

@ -74,6 +74,13 @@ CONFIG_MACH_ARMADA_38X=y
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
##
@ -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

34
debian/config/config vendored
View File

@ -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
@ -931,11 +931,6 @@ CONFIG_IDE_PROC_FS=y
# CONFIG_BLK_DEV_JMICRON is not set
# CONFIG_BLK_DEV_IT821X is not set
##
## file: drivers/idle/Kconfig
##
CONFIG_I7300_IDLE=m
##
## file: drivers/iio/Kconfig
##
@ -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
@ -2768,6 +2765,11 @@ CONFIG_JME=m
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
##
@ -3886,11 +3888,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
##
@ -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
##
@ -4382,11 +4377,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
##
@ -5275,11 +5265,6 @@ CONFIG_JFS_SECURITY=y
# CONFIG_JFS_DEBUG is not set
# CONFIG_JFS_STATISTICS is not set
##
## file: fs/logfs/Kconfig
##
CONFIG_LOGFS=m
##
## file: fs/minix/Kconfig
##
@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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
@ -1563,14 +1569,6 @@ CONFIG_COMEDI_VMK80XX=m
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
##
@ -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

View File

@ -675,11 +675,6 @@ CONFIG_BINFMT_MISC=m
##
# CONFIG_JFS_FS is not set
##
## file: fs/logfs/Kconfig
##
# CONFIG_LOGFS is not set
##
## file: fs/ntfs/Kconfig
##