Update config for renaming/removal/replacement/merging/splitting of various symbols

2016-04-20 17:48:47 +01:00 · 2016-04-20 17:48:47 +01:00 · 16744a30b6
parent 828cd7b1e8
commit 16744a30b6
13 changed files with 41 additions and 78 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,6 +1,8 @@
 linux (4.6~rc3-1~exp2) UNRELEASED; urgency=medium

  * [armhf] Enable EFI, RTC_DRV_EFI
+  * Update config for renaming/removal/replacement/merging/splitting of various
+    symbols

 -- Ben Hutchings <ben@decadent.org.uk>  Wed, 20 Apr 2016 17:25:51 +0100

--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@ -121,7 +121,6 @@ CONFIG_ATM_HE_USE_SUNI=y
 ## file: drivers/block/Kconfig
 ##
 CONFIG_BLK_DEV_FD=m
-CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_CISS_SCSI_TAPE=y
 CONFIG_BLK_DEV_DAC960=m
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@ -66,6 +66,10 @@ CONFIG_CRYPTO_DEV_QCE=m
 ## file: drivers/dma/Kconfig
 ##
 CONFIG_DMADEVICES=y
+
+##
+## file: drivers/dma/qcom/Kconfig
+##
 CONFIG_QCOM_BAM_DMA=m

 ##
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@ -736,11 +736,6 @@ CONFIG_IPV6=m
 ##
 # CONFIG_NET_MPLS_GSO is not set

-##
-## file: net/netlink/Kconfig
-##
-# CONFIG_NETLINK_MMAP is not set
-
 ##
 ## file: sound/soc/Kconfig
 ##
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@ -494,7 +494,7 @@ CONFIG_TI_EMIF=m
 ## file: drivers/mfd/Kconfig
 ##
 CONFIG_MFD_AS3722=y
-CONFIG_MFD_AXP20X=y
+CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_DA9052_SPI=y
 CONFIG_MFD_DA9052_I2C=y
 CONFIG_MFD_MC13XXX_SPI=m
@ -848,10 +848,10 @@ CONFIG_REGULATOR_VEXPRESS=m
 CONFIG_RTC_DRV_AS3722=y
 CONFIG_RTC_DRV_DS1307=y
 CONFIG_RTC_DRV_ISL12057=y
-CONFIG_RTC_DRV_PALMAS=y
 CONFIG_RTC_DRV_PCF8523=y
 CONFIG_RTC_DRV_PCF8563=y
 CONFIG_RTC_DRV_TWL4030=y
+CONFIG_RTC_DRV_PALMAS=y
 CONFIG_RTC_DRV_S5M=y
 CONFIG_RTC_DRV_DA9052=y
 CONFIG_RTC_DRV_EFI=y
--- a/debian/config/config
+++ b/debian/config/config
@ -127,7 +127,6 @@ CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=m
 # CONFIG_CRYPTO_842 is not set
 CONFIG_CRYPTO_LZ4=m
@ -407,8 +406,8 @@ CONFIG_IPWIRELESS=m
 # CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_COMMON_CLK_SI514 is not set
 # CONFIG_COMMON_CLK_SI570 is not set
-# CONFIG_COMMON_CLK_CDCE925 is not set
 # CONFIG_COMMON_CLK_CDCE706 is not set
+# CONFIG_COMMON_CLK_CDCE925 is not set

 ##
 ## file: drivers/connector/Kconfig
@ -1044,7 +1043,8 @@ CONFIG_HID_SENSOR_GYRO_3D=m
 ##
 ## file: drivers/iio/imu/inv_mpu6050/Kconfig
 ##
-# CONFIG_INV_MPU6050_IIO is not set
+# CONFIG_INV_MPU6050_I2C is not set
+# CONFIG_INV_MPU6050_SPI is not set

 ##
 ## file: drivers/iio/light/Kconfig
@ -1086,6 +1086,8 @@ CONFIG_HID_SENSOR_PROX=m
 CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 # CONFIG_MMC35240 is not set
 # CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set

 ##
 ## file: drivers/iio/orientation/Kconfig
@ -1103,7 +1105,8 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 ##
 # CONFIG_BMP280 is not set
 CONFIG_HID_SENSOR_PRESS=m
-# CONFIG_MPL115 is not set
+# CONFIG_MPL115_I2C is not set
+# CONFIG_MPL115_SPI is not set
 # CONFIG_MPL3115 is not set
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
@ -1338,6 +1341,11 @@ CONFIG_MOUSE_PS2_FOCALTECH=y
 CONFIG_MOUSE_SYNAPTICS_I2C=m
 CONFIG_MOUSE_SYNAPTICS_USB=m

+##
+## file: drivers/input/rmi4/Kconfig
+##
+# CONFIG_RMI4_CORE is not set
+
 ##
 ## file: drivers/input/serio/Kconfig
 ##
@ -1574,7 +1582,6 @@ CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_MQ=y
 CONFIG_DM_CACHE_SMQ=m
 CONFIG_DM_CACHE_CLEANER=y
 CONFIG_DM_ERA=m
@ -1898,7 +1905,6 @@ CONFIG_VIDEO_ZORAN_AVS6EYES=m
 ## file: drivers/media/platform/Kconfig
 ##
 CONFIG_V4L_PLATFORM_DRIVERS=y
-# CONFIG_VIDEO_TIMBERDALE is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 # CONFIG_VIDEO_SH_VEU is not set
@ -2316,7 +2322,6 @@ CONFIG_FUSION_LAN=m
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
 # CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_AXP20X is not set
 # CONFIG_MFD_CROS_EC is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_DA9052_SPI is not set
@ -2386,7 +2391,6 @@ CONFIG_AB3100_OTP=m
 # CONFIG_MFD_TPS65218 is not set
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TPS65910 is not set
-# CONFIG_MFD_TPS65912 is not set
 # CONFIG_MFD_TPS65912_I2C is not set
 # CONFIG_MFD_TPS65912_SPI is not set
 # CONFIG_MFD_TPS80031 is not set
@ -2438,6 +2442,7 @@ 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
@ -2703,7 +2708,7 @@ CONFIG_CAN_8DEV_USB=m
 ##
 # CONFIG_NET_DSA_MV88E6060 is not set
 # CONFIG_NET_DSA_MV88E6131 is not set
-# CONFIG_NET_DSA_MV88E6123_61_65 is not set
+# CONFIG_NET_DSA_MV88E6123 is not set
 # CONFIG_NET_DSA_MV88E6171 is not set
 # CONFIG_NET_DSA_BCM_SF2 is not set

@ -3821,7 +3826,6 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_DS1307 is not set
 # CONFIG_RTC_DRV_DS1374 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS3232 is not set
 # CONFIG_RTC_DRV_HYM8563 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
@ -3829,10 +3833,9 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_ISL12022 is not set
 # CONFIG_RTC_DRV_ISL12057 is not set
 # CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_PCF2127 is not set
 # CONFIG_RTC_DRV_PCF8523 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF85063 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
 # CONFIG_RTC_DRV_M41T80_WDT is not set
@ -3850,13 +3853,14 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_DS1343 is not set
 # CONFIG_RTC_DRV_DS1347 is not set
 # CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_DS3234 is not set
-# CONFIG_RTC_DRV_PCF2123 is not set
 # CONFIG_RTC_DRV_RX4581 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
 # CONFIG_RTC_DRV_MCP795 is not set
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_PCF2127 is not set
 CONFIG_RTC_DRV_CMOS=m
 # CONFIG_RTC_DRV_DS1286 is not set
 # CONFIG_RTC_DRV_DS1511 is not set
@ -4083,6 +4087,7 @@ CONFIG_SPI=y
 CONFIG_SPI_BITBANG=m
 CONFIG_SPI_BUTTERFLY=m
 # CONFIG_SPI_CADENCE is not set
+# CONFIG_SPI_DESIGNWARE is not set
 # CONFIG_SPI_GPIO is not set
 CONFIG_SPI_LM70_LLP=m
 # CONFIG_SPI_FSL_SPI is not set
@ -4094,7 +4099,6 @@ CONFIG_SPI_LM70_LLP=m
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
-# CONFIG_SPI_DESIGNWARE is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set

@ -4133,11 +4137,6 @@ CONFIG_STAGING=y
 ##
 # CONFIG_COMEDI is not set

-##
-## file: drivers/staging/dgap/Kconfig
-##
-# CONFIG_DGAP is not set
-
 ##
 ## file: drivers/staging/dgnc/Kconfig
 ##
@ -4153,11 +4152,6 @@ CONFIG_STAGING=y
 ##
 # CONFIG_LTE_GDM724X is not set

-##
-## file: drivers/staging/gdm72xx/Kconfig
-##
-# CONFIG_WIMAX_GDM72XX is not set
-
 ##
 ## file: drivers/staging/gs_fpgaboot/Kconfig
 ##
@ -4219,12 +4213,6 @@ CONFIG_STAGING=y
 # CONFIG_TSL2583 is not set
 # CONFIG_TSL2x7x is not set

-##
-## file: drivers/staging/iio/magnetometer/Kconfig
-##
-# CONFIG_SENSORS_HMC5843_I2C is not set
-# CONFIG_SENSORS_HMC5843_SPI is not set
-
 ##
 ## file: drivers/staging/iio/meter/Kconfig
 ##
@ -4257,6 +4245,11 @@ CONFIG_STAGING=y
 # CONFIG_LIRC_STAGING is not set
 # CONFIG_LIRC_PARALLEL is not set

+##
+## file: drivers/staging/media/timb/Kconfig
+##
+# CONFIG_VIDEO_TIMBERDALE is not set
+
 ##
 ## file: drivers/staging/most/Kconfig
 ##
@ -4267,11 +4260,6 @@ CONFIG_STAGING=y
 ##
 # CONFIG_MTD_SPINAND_MT29F is not set

-##
-## file: drivers/staging/panel/Kconfig
-##
-# CONFIG_PANEL is not set
-
 ##
 ## file: drivers/staging/rdma/Kconfig
 ##
@ -4347,11 +4335,6 @@ CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m

-##
-## file: drivers/staging/ste_rmi4/Kconfig
-##
-# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
-
 ##
 ## file: drivers/staging/vt6655/Kconfig
 ##
@ -5259,7 +5242,7 @@ CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_V4_SECURITY_LABEL=y
 # CONFIG_NFSD_FAULT_INJECTION is not set

@ -6098,7 +6081,6 @@ CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_UDP_DIAG=m
 CONFIG_TCP_CONG_ADVANCED=y
@ -6453,7 +6435,6 @@ CONFIG_IP_VS_PE_SIP=m
 ##
 ## file: net/netlink/Kconfig
 ##
-CONFIG_NETLINK_MMAP=y
 CONFIG_NETLINK_DIAG=m

 ##
@ -6628,7 +6609,6 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_CFG80211=m
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
 # CONFIG_CFG80211_CERTIFICATION_ONUS is not set
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
@ -6891,7 +6871,8 @@ CONFIG_SND_PDAUDIOCF=m
 # CONFIG_SND_SOC_ES8328 is not set
 # CONFIG_SND_SOC_GTM601 is not set
 # CONFIG_SND_SOC_PCM1681 is not set
-# CONFIG_SND_SOC_PCM179X is not set
+# CONFIG_SND_SOC_PCM179X_I2C is not set
+# CONFIG_SND_SOC_PCM179X_SPI is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
 # CONFIG_SND_SOC_RT5631 is not set
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@ -32,7 +32,6 @@ CONFIG_PATA_LEGACY=m
 ## file: drivers/block/Kconfig
 ##
 # CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
--- a/debian/config/kernelarch-mips/config.4kc-malta
+++ b/debian/config/kernelarch-mips/config.4kc-malta
@ -351,8 +351,8 @@ CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_MAX6902=m
 CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
 CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_M48T86=m

--- a/debian/config/kernelarch-mips/config.5kc-malta
+++ b/debian/config/kernelarch-mips/config.5kc-malta
@ -353,8 +353,8 @@ CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_MAX6902=m
 CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
 CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_M48T86=m

--- a/debian/config/kernelarch-mips/config.octeon
+++ b/debian/config/kernelarch-mips/config.octeon
@ -116,7 +116,7 @@ CONFIG_MTD_CFI_AMDSTD=y
 CONFIG_MTD_PHYSMAP=y

 ##
-## file: drivers/net/ethernet/octeon/Kconfig
+## file: drivers/net/ethernet/cavium/Kconfig
 ##
 CONFIG_OCTEON_MGMT_ETHERNET=y

--- a/debian/config/kernelarch-powerpc/config
+++ b/debian/config/kernelarch-powerpc/config
@ -126,7 +126,6 @@ CONFIG_ATM_HE=m
 ## file: drivers/block/Kconfig
 ##
 CONFIG_BLK_DEV_FD=m
-CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_CISS_SCSI_TAPE=y
 CONFIG_BLK_DEV_DAC960=m
--- a/debian/config/kernelarch-sparc/config
+++ b/debian/config/kernelarch-sparc/config
@ -44,7 +44,6 @@ CONFIG_PATA_LEGACY=m
 ## file: drivers/block/Kconfig
 ##
 CONFIG_BLK_DEV_FD=y
-# CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@ -88,7 +88,6 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_EARLY_PRINTK_EFI=y
 # CONFIG_X86_PTDUMP is not set
 # CONFIG_EFI_PGT_DUMP is not set
-CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
 CONFIG_DEBUG_WX=y
 CONFIG_DEBUG_SET_MODULE_RONX=y
@ -109,7 +108,6 @@ CONFIG_IO_DELAY_0X80=y
 CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_DEBUG_ENTRY is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
-# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 # CONFIG_PUNIT_ATOM_DEBUG is not set

 ##
@ -263,7 +261,6 @@ CONFIG_KS0108_DELAY=2
 ## file: drivers/block/Kconfig
 ##
 CONFIG_BLK_DEV_FD=m
-CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_CISS_SCSI_TAPE=y
 CONFIG_BLK_DEV_DAC960=m
@ -683,7 +680,7 @@ CONFIG_KMX61=m
 ##
 ## file: drivers/iio/imu/inv_mpu6050/Kconfig
 ##
-CONFIG_INV_MPU6050_IIO=m
+CONFIG_INV_MPU6050_I2C=m

 ##
 ## file: drivers/iio/light/Kconfig
@ -1548,18 +1545,6 @@ CONFIG_COMEDI_VMK80XX=m
 CONFIG_COMEDI_8255_SA=m
 CONFIG_COMEDI_KCOMEDILIB=m

-##
-## file: drivers/staging/gdm72xx/Kconfig
-##
-CONFIG_WIMAX_GDM72XX=m
-# CONFIG_WIMAX_GDM72XX_QOS is not set
-# CONFIG_WIMAX_GDM72XX_K_MODE is not set
-# CONFIG_WIMAX_GDM72XX_WIMAX2 is not set
-## choice: Select interface
-CONFIG_WIMAX_GDM72XX_USB=y
-## end choice
-CONFIG_WIMAX_GDM72XX_USB_PM=y
-
 ##
 ## file: drivers/staging/iio/light/Kconfig
 ##