Clean up kconfig with the aid of kconfigeditor2

Re-enable various options disabled by name changes in 4.7. Delete options completely removed in 4.7.
2016-07-20 04:12:55 +01:00 · 2016-07-20 04:12:55 +01:00 · 7aa0b02a27
parent 50f9dba92e
commit 7aa0b02a27
12 changed files with 42 additions and 38 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,6 +1,10 @@
 linux (4.7~rc7-1~exp2) UNRELEASED; urgency=medium

  * sched: Enable SCHEDSTATS (Closes: #796674)
+  * Re-enable various config options disabled by name changes in 4.7:
+    - nfc: NFC_PN533_USB replaced NFC_PN533
+    - [armhf] dsa: NET_DSA_MV88E6XXX replaced NET_DSA_MV88E6{123,131,171}
+    - [x86] ACPI: ACPI_TABLE_UPGRADE replaced ACPI_INITRD_TABLE_OVERRIDE

 -- Ben Hutchings <ben@decadent.org.uk>  Wed, 20 Jul 2016 03:50:18 +0100

--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@ -765,7 +765,6 @@ CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_GENERIC_NCR5380=m
 CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
-CONFIG_SCSI_GENERIC_NCR53C400=y
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@ -105,7 +105,6 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 ## file: drivers/iommu/Kconfig
 ##
 CONFIG_AMD_IOMMU=y
-# CONFIG_AMD_IOMMU_STATS is not set
 #. Can be built as a module, but nothing will trigger loading
 CONFIG_AMD_IOMMU_V2=y

--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@ -89,7 +89,6 @@ CONFIG_EXTCON=m
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
-CONFIG_GPIO_MAX77620=y

 ##
 ## file: drivers/gpu/drm/Kconfig
@ -311,7 +310,6 @@ CONFIG_PHY_TEGRA_XUSB=m
 ##
 ## file: drivers/pinctrl/qcom/Kconfig
 ##
-CONFIG_PINCTRL_MAX77620=y
 CONFIG_PINCTRL_MSM8916=y
 CONFIG_PINCTRL_QCOM_SSBI_PMIC=m

@ -488,3 +486,9 @@ CONFIG_SND_SOC_TEGRA_ALC5632=m
 CONFIG_SND_SOC_TEGRA_MAX98090=m
 CONFIG_SND_SOC_TEGRA_RT5677=m

+##
+## file: unknown
+##
+CONFIG_GPIO_MAX77620=y
+CONFIG_PINCTRL_MAX77620=y
+
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@ -675,7 +675,9 @@ CONFIG_ORION_WATCHDOG=m
 # CONFIG_MEMCG is not set
 # CONFIG_CFS_BANDWIDTH is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
+## choice: Compiler optimization level
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+## end choice
 # CONFIG_PROFILING is not set
 # CONFIG_MODULE_SIG is not set

--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@ -540,9 +540,9 @@ CONFIG_MFD_AS3722=y
 CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_DA9052_SPI=y
 CONFIG_MFD_DA9052_I2C=y
-CONFIG_MFD_MAX77686=y
 CONFIG_MFD_MC13XXX_SPI=m
 CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_MFD_MAX77686=y
 CONFIG_MFD_SEC_CORE=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_PALMAS=y
@ -572,9 +572,9 @@ CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
 CONFIG_MMC_SDHCI_TEGRA=m
+CONFIG_MMC_SDHCI_S3C=m
 CONFIG_MMC_SDHCI_PXAV3=m
 CONFIG_MMC_SDHCI_BCM2835=m
-CONFIG_MMC_SDHCI_S3C=m
 CONFIG_MMC_OMAP=m
 CONFIG_MMC_OMAP_HS=m
 CONFIG_MMC_MVSDIO=m
@ -616,10 +616,7 @@ CONFIG_CAN_SUN4I=m
 ## file: drivers/net/dsa/Kconfig
 ##
 CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6131=m
-CONFIG_NET_DSA_MV88E6123=m
-CONFIG_NET_DSA_MV88E6171=m
-CONFIG_NET_DSA_MV88E6352=m
+CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_BCM_SF2=m

 ##
@ -908,6 +905,7 @@ CONFIG_REGULATOR_VEXPRESS=m
 ##
 CONFIG_RTC_DRV_AS3722=y
 CONFIG_RTC_DRV_DS1307=y
+CONFIG_RTC_DRV_MAX77686=y
 CONFIG_RTC_DRV_ISL12057=y
 CONFIG_RTC_DRV_PCF8523=y
 CONFIG_RTC_DRV_PCF8563=y
@ -918,7 +916,6 @@ CONFIG_RTC_DRV_DA9052=y
 CONFIG_RTC_DRV_EFI=y
 CONFIG_RTC_DRV_IMXDI=y
 CONFIG_RTC_DRV_OMAP=y
-CONFIG_RTC_DRV_MAX77686=y
 CONFIG_RTC_DRV_PL030=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_VT8500=y
--- a/debian/config/config
+++ b/debian/config/config
@ -156,7 +156,7 @@ CONFIG_A11Y_BRAILLE_CONSOLE=y
 ## file: drivers/acpi/Kconfig
 ##
 # CONFIG_ACPI_DEBUGGER is not set
-CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
+CONFIG_ACPI_TABLE_UPGRADE=y
 # CONFIG_ACPI_BGRT is not set
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
 CONFIG_ACPI_NFIT=m
@ -1081,7 +1081,8 @@ CONFIG_HID_SENSOR_PROX=m
 ##
 # CONFIG_AK8975 is not set
 # CONFIG_AK09911 is not set
-# CONFIG_BMC150_MAGN is not set
+# CONFIG_BMC150_MAGN_I2C is not set
+# CONFIG_BMC150_MAGN_SPI is not set
 # CONFIG_MAG3110 is not set
 CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 # CONFIG_MMC35240 is not set
@ -2707,9 +2708,7 @@ CONFIG_CAN_8DEV_USB=m
 ## file: drivers/net/dsa/Kconfig
 ##
 # CONFIG_NET_DSA_MV88E6060 is not set
-# CONFIG_NET_DSA_MV88E6131 is not set
-# CONFIG_NET_DSA_MV88E6123 is not set
-# CONFIG_NET_DSA_MV88E6171 is not set
+# CONFIG_NET_DSA_MV88E6XXX is not set
 # CONFIG_NET_DSA_BCM_SF2 is not set

 ##
@ -3447,7 +3446,6 @@ CONFIG_IWLWIFI=m
 CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
 # CONFIG_IWLWIFI_BCAST_FILTERING is not set
-# CONFIG_IWLWIFI_UAPSD is not set
 # CONFIG_IWLWIFI_DEBUG is not set
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set

@ -3588,7 +3586,6 @@ CONFIG_ZD1211RW=m
 ##
 ## file: drivers/nfc/Kconfig
 ##
-CONFIG_NFC_PN533=m
 # CONFIG_NFC_TRF7970A is not set
 CONFIG_NFC_SIM=m
 CONFIG_NFC_PORT100=m
@ -3599,6 +3596,11 @@ CONFIG_NFC_PORT100=m
 # CONFIG_NFC_MICROREAD_I2C is not set
 # CONFIG_NFC_MICROREAD_MEI is not set

+##
+## file: drivers/nfc/pn533/Kconfig
+##
+CONFIG_NFC_PN533_USB=m
+
 ##
 ## file: drivers/nfc/st21nfca/Kconfig
 ##
@ -3849,7 +3851,6 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_RX8581 is not set
 # CONFIG_RTC_DRV_RX8025 is not set
 # CONFIG_RTC_DRV_EM3027 is not set
-# CONFIG_RTC_DRV_RV3029C2 is not set
 # CONFIG_RTC_DRV_RV8803 is not set
 # CONFIG_RTC_DRV_M41T93 is not set
 # CONFIG_RTC_DRV_M41T94 is not set
@ -3865,6 +3866,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_MCP795 is not set
 # CONFIG_RTC_DRV_DS3232 is not set
 # CONFIG_RTC_DRV_PCF2127 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
 CONFIG_RTC_DRV_CMOS=m
 # CONFIG_RTC_DRV_DS1286 is not set
 # CONFIG_RTC_DRV_DS1511 is not set
@ -4166,9 +4168,7 @@ CONFIG_STAGING=y
 ##
 # CONFIG_ADIS16201 is not set
 # CONFIG_ADIS16203 is not set
-# CONFIG_ADIS16204 is not set
 # CONFIG_ADIS16209 is not set
-# CONFIG_ADIS16220 is not set
 # CONFIG_ADIS16240 is not set
 # CONFIG_LIS3L02DQ is not set
 # CONFIG_SCA3000 is not set
@ -4264,11 +4264,6 @@ CONFIG_STAGING=y
 ##
 # CONFIG_MTD_SPINAND_MT29F is not set

-##
-## file: drivers/staging/rdma/Kconfig
-##
-# CONFIG_STAGING_RDMA is not set
-
 ##
 ## file: drivers/staging/rtl8188eu/Kconfig
 ##
@ -4413,7 +4408,6 @@ CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_MOXA_SMARTIO=m
 CONFIG_SYNCLINK_GT=m
@ -5532,7 +5526,9 @@ CONFIG_SCHED_AUTOGROUP=y
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
+## choice: Compiler optimization level
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+## end choice
 #. Unfortunately some useful options are conditional on EXPERT
 CONFIG_EXPERT=y
 CONFIG_UID16=y
@ -6744,7 +6740,6 @@ CONFIG_SND_PCM_TIMER=y
 # CONFIG_SND_SEQUENCER_OSS is not set
 CONFIG_SND_HRTIMER=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-# CONFIG_SND_RTCTIMER is not set
 CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_MAX_CARDS=32
 CONFIG_SND_SUPPORT_OLD_API=y
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@ -361,7 +361,6 @@ CONFIG_SCSI_DTC3280=m
 CONFIG_SCSI_EATA_PIO=m
 # CONFIG_SCSI_GENERIC_NCR5380 is not set
 # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_GENERIC_NCR53C400 is not set
 # CONFIG_SCSI_INIA100 is not set
 CONFIG_SCSI_NCR53C406A=m
 CONFIG_SCSI_PAS16=m
--- a/debian/config/kernelarch-powerpc/config-arch-64
+++ b/debian/config/kernelarch-powerpc/config-arch-64
@ -135,11 +135,6 @@ CONFIG_HVCS=m
 ##
 # CONFIG_SERIAL_ICOM is not set

-##
-## file: drivers/video/fbdev/Kconfig
-##
-# CONFIG_FB_IMSTT is not set
-
 ##
 ## file: drivers/vfio/Kconfig
 ##
@ -150,6 +145,11 @@ CONFIG_VFIO=m
 ##
 CONFIG_VFIO_PCI=m

+##
+## file: drivers/video/fbdev/Kconfig
+##
+# CONFIG_FB_IMSTT is not set
+
 ##
 ## file: drivers/watchdog/Kconfig
 ##
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@ -123,7 +123,7 @@ CONFIG_KVM_DEVICE_ASSIGNMENT=y
 ##
 ## file: arch/x86/ras/Kconfig
 ##
-# CONFIG_AMD_MCE_INJ is not set
+# CONFIG_MCE_AMD_INJ is not set

 ##
 ## file: arch/x86/xen/Kconfig
@ -1637,9 +1637,13 @@ CONFIG_THERMAL=m
 CONFIG_INTEL_POWERCLAMP=m
 CONFIG_X86_PKG_TEMP_THERMAL=m
 CONFIG_INTEL_SOC_DTS_THERMAL=m
-CONFIG_INT340X_THERMAL=m
 CONFIG_INTEL_PCH_THERMAL=m

+##
+## file: drivers/thermal/int340x_thermal/Kconfig
+##
+CONFIG_INT340X_THERMAL=m
+
 ##
 ## file: drivers/thunderbolt/Kconfig
 ##
@ -1667,6 +1671,7 @@ CONFIG_SERIAL_JSM=m
 ## file: drivers/tty/serial/8250/Kconfig
 ##
 CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_FINTEK=m
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=32
@ -1677,7 +1682,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_DW=y
-CONFIG_SERIAL_8250_FINTEK=m

 ##
 ## file: drivers/usb/Kconfig
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@ -723,7 +723,9 @@ CONFIG_USELIB=y
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=16
 # CONFIG_SCHED_AUTOGROUP is not set
+## choice: Compiler optimization level
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+## end choice
 CONFIG_SGETMASK_SYSCALL=y
 CONFIG_SYSFS_SYSCALL=y
 CONFIG_COMPAT_BRK=y
--- a/debian/config/sh4/config.sh7785lcr
+++ b/debian/config/sh4/config.sh7785lcr
@ -174,7 +174,6 @@ CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y

 ##
 ## file: drivers/tty/serial/Kconfig