Clean up kconfig with the aid of kconfigeditor2

- Various obsolete drivers and broken features were removed in 4.12
- A few symbols were renamed
- A few symbols changed type from tristate to bool

6 files changed, 14 insertions, 29 deletions

diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index c86b9bbf4913..52735ad22eb5 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -158,7 +158,6 @@ CONFIG_QCOM_HIDMA=m
 ## file: drivers/edac/Kconfig
 ##
 CONFIG_EDAC=y
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_XGENE=m
 
 ##
@@ -674,7 +673,6 @@ CONFIG_RASPBERRYPI_POWER=y
 ##
 CONFIG_QCOM_GSBI=m
 CONFIG_QCOM_SMEM=m
-CONFIG_QCOM_SMD=m
 CONFIG_QCOM_SMD_RPM=m
 CONFIG_QCOM_SMP2P=m
 CONFIG_QCOM_SMSM=m
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 3a9998f5507e..ef09005ddcc7 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -159,6 +159,11 @@ CONFIG_PATA_PLATFORM=m
 CONFIG_PATA_OF_PLATFORM=m
 
 ##
+## file: drivers/auxdisplay/Kconfig
+##
+CONFIG_ARM_CHARLCD=y
+
+##
 ## file: drivers/base/Kconfig
 ##
 CONFIG_DMA_CMA=y
@@ -327,9 +332,9 @@ CONFIG_DRM_PANEL_SIMPLE=m
 ## file: drivers/gpu/drm/rockchip/Kconfig
 ##
 CONFIG_DRM_ROCKCHIP=m
-CONFIG_ROCKCHIP_ANALOGIX_DP=m
-CONFIG_ROCKCHIP_DW_HDMI=m
-CONFIG_ROCKCHIP_DW_MIPI_DSI=m
+CONFIG_ROCKCHIP_ANALOGIX_DP=y
+CONFIG_ROCKCHIP_DW_HDMI=y
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 
 ##
 ## file: drivers/gpu/drm/tegra/Kconfig
@@ -382,7 +387,6 @@ CONFIG_OMAP_SSI=m
 CONFIG_SENSORS_G762=m
 CONFIG_SENSORS_GPIO_FAN=m
 CONFIG_SENSORS_PWM_FAN=m
-CONFIG_SENSORS_TWL4030_MADC=m
 
 ##
 ## file: drivers/hwspinlock/Kconfig
@@ -585,11 +589,6 @@ CONFIG_TWL4030_CORE=y
 CONFIG_TWL6040_CORE=y
 
 ##
-## file: drivers/misc/Kconfig
-##
-CONFIG_ARM_CHARLCD=y
-
-##
 ## file: drivers/misc/ti-st/Kconfig
 ##
 CONFIG_TI_ST=m
@@ -909,13 +908,13 @@ CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 ##
 CONFIG_BATTERY_SBS=m
 CONFIG_BATTERY_BQ27XXX=m
+CONFIG_AXP20X_POWER=m
 CONFIG_BATTERY_TWL4030_MADC=m
 CONFIG_BATTERY_RX51=m
 CONFIG_CHARGER_ISP1704=m
 CONFIG_CHARGER_TWL4030=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_CHARGER_BQ2415X=m
-CONFIG_AXP20X_POWER=m
 
 ##
 ## file: drivers/pwm/Kconfig
diff --git a/debian/config/config b/debian/config/config
index 17f4bd0ef12f..5733e22126c9 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -175,7 +175,6 @@ CONFIG_ACPI_TABLE_UPGRADE=y
 ## file: drivers/acpi/nfit/Kconfig
 ##
 CONFIG_ACPI_NFIT=m
-# CONFIG_ACPI_NFIT_DEBUG is not set
 
 ##
 ## file: drivers/android/Kconfig
@@ -281,6 +280,7 @@ CONFIG_ATM_SOLOS=m
 ## file: drivers/auxdisplay/Kconfig
 ##
 # CONFIG_AUXDISPLAY is not set
+# CONFIG_PANEL is not set
 
 ##
 ## file: drivers/base/Kconfig
@@ -322,7 +322,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_SKD=m
-CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -331,7 +330,6 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_BLKDEV_BACKEND=m
 CONFIG_VIRTIO_BLK=m
-# CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RBD=m
 # CONFIG_BLK_DEV_RSXX is not set
 
@@ -1694,7 +1692,6 @@ CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
-CONFIG_LEDS_DELL_NETBOOKS=m
 CONFIG_LEDS_MC13783=m
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_TLC591XX is not set
@@ -1751,7 +1748,6 @@ CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_CACHE_CLEANER=y
 CONFIG_DM_ERA=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_LOG_USERSPACE=m
@@ -1877,6 +1873,7 @@ CONFIG_VIDEO_SAA7127=m
 CONFIG_VIDEO_SAA7185=m
 CONFIG_VIDEO_ADV7170=m
 CONFIG_VIDEO_ADV7175=m
+# CONFIG_VIDEO_OV2640 is not set
 CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_NOON010PC30=m
@@ -1897,7 +1894,6 @@ CONFIG_VIDEO_CX25840=m
 # CONFIG_SOC_CAMERA_MT9T031 is not set
 # CONFIG_SOC_CAMERA_MT9T112 is not set
 # CONFIG_SOC_CAMERA_MT9V022 is not set
-# CONFIG_SOC_CAMERA_OV2640 is not set
 # CONFIG_SOC_CAMERA_OV6650 is not set
 # CONFIG_SOC_CAMERA_OV772X is not set
 # CONFIG_SOC_CAMERA_OV9640 is not set
@@ -2628,7 +2624,6 @@ CONFIG_TI_DAC7512=m
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 # CONFIG_SRAM is not set
-# CONFIG_PANEL is not set
 
 ##
 ## file: drivers/misc/altera-stapl/Kconfig
@@ -3105,7 +3100,6 @@ CONFIG_IXGBE_DCB=y
 CONFIG_IXGBEVF=m
 CONFIG_I40E=m
 CONFIG_I40E_DCB=y
-CONFIG_I40E_FCOE=y
 CONFIG_I40EVF=m
 # CONFIG_FM10K is not set
 
@@ -3389,7 +3383,6 @@ CONFIG_MCS_FIR=m
 ##
 ## file: drivers/net/phy/Kconfig
 ##
-CONFIG_PHYLIB=m
 # CONFIG_MDIO_BCM_UNIMAC is not set
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
@@ -3397,6 +3390,7 @@ CONFIG_PHYLIB=m
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
+CONFIG_PHYLIB=m
 CONFIG_AMD_PHY=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AT803X_PHY=m
diff --git a/debian/config/kernelarch-mips/config.octeon b/debian/config/kernelarch-mips/config.octeon
index 046c1a883e66..8ca915304cbb 100644
--- a/debian/config/kernelarch-mips/config.octeon
+++ b/debian/config/kernelarch-mips/config.octeon
@@ -18,7 +18,6 @@ CONFIG_NR_CPUS=64
 ##
 CONFIG_CAVIUM_CN63XXP1=y
 CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=1
-# CONFIG_CAVIUM_OCTEON_2ND_KERNEL is not set
 CONFIG_CAVIUM_OCTEON_LOCK_L2=y
 CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB=y
 CONFIG_CAVIUM_OCTEON_LOCK_L2_EXCEPTION=y
@@ -50,7 +49,6 @@ CONFIG_HW_RANDOM_OCTEON=m
 ## file: drivers/edac/Kconfig
 ##
 CONFIG_EDAC=y
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_OCTEON_PC=m
 CONFIG_EDAC_OCTEON_L2C=m
 CONFIG_EDAC_OCTEON_LMC=m
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 7fd2bcdac25e..4210cc83a926 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -125,7 +125,6 @@ CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 # CONFIG_KVM_MMU_AUDIT is not set
-CONFIG_KVM_DEVICE_ASSIGNMENT=y
 
 ##
 ## file: arch/x86/ras/Kconfig
@@ -433,7 +432,6 @@ CONFIG_DW_DMAC=m
 CONFIG_EDAC=y
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_AMD64=m
 # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
 CONFIG_EDAC_AMD76X=m
@@ -861,7 +859,6 @@ CONFIG_ISDN_DIVAS_MAINT=m
 ## file: drivers/leds/Kconfig
 ##
 CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_DELL_NETBOOKS=m
 CONFIG_LEDS_MENF21BMC=m
 
 ##
@@ -889,6 +886,7 @@ CONFIG_IR_NUVOTON=m
 CONFIG_IR_WINBOND_CIR=m
 CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
+CONFIG_IR_SIR=m
 
 ##
 ## file: drivers/media/tuners/Kconfig
@@ -1370,6 +1368,7 @@ CONFIG_ASUS_LAPTOP=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
+CONFIG_DELL_WMI_LED=m
 CONFIG_DELL_SMO8800=m
 CONFIG_DELL_RBTN=m
 CONFIG_FUJITSU_LAPTOP=m
@@ -1619,8 +1618,6 @@ CONFIG_STAGING_MEDIA=y
 ## file: drivers/staging/media/lirc/Kconfig
 ##
 CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SIR=m
 CONFIG_LIRC_ZILOG=m
 
 ##
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index d5ff57130d0b..b21fab7636b2 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -103,7 +103,6 @@ CONFIG_ATARI_FLOPPY=m
 CONFIG_BLK_DEV_SWIM=m
 CONFIG_AMIGA_Z2RAM=y
 CONFIG_CDROM_PKTCDVD=m
-# CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_RBD is not set
 
 ##