UBUNTU: [Config] Fix up s390x config options changed during 4.10 rebase

Fix the following options mistakenly changed during the rebase
from 4.9 to 4.10.

 - CONFIG_I2C was selected by CONFIG_SFC_FALCON but should be
   disabled because s390x lacks hw support. Revert these and
   related options, and enforce the CONFIG_I2C values to prevent
   this in the future.

 - Change CONFIG_LPC_SCH from m to n.

 - Change CONFIG_NVMEM from m to n.

 - Change CONFIG_REGULATOR from m to n.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index c75824d47d5b81445fabe02c0a6f4ebe9df731ad..023dcdb7573c3b8849d90da8ebb49000f529f513 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -161,7 +161,6 @@ CONFIG_HWMON=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 # CONFIG_HZ_100 is not set
 CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_SLAVE is not set
 CONFIG_I6300ESB_WDT=m
@@ -202,6 +201,7 @@ CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
 CONFIG_MAC_PARTITION=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 CONFIG_MAILBOX=y
@@ -217,11 +217,9 @@ CONFIG_MEMORY=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMSTICK=m
 CONFIG_MEM_SOFT_DIRTY=y
-CONFIG_MFD_DA9063=y
+CONFIG_MFD_CORE=y
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_KEMPLD=m
-CONFIG_MFD_MAX14577=y
-CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MT6397=m
 CONFIG_MFD_RTSX_PCI=m
 CONFIG_MFD_SM501=m
@@ -229,8 +227,6 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 # CONFIG_MFD_TMIO is not set
 CONFIG_MFD_TPS65217=m
-CONFIG_MFD_TPS65912=y
-CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
@@ -310,6 +306,7 @@ CONFIG_NUMA=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 # CONFIG_NUMA_EMU is not set
+CONFIG_NVMEM=m
 CONFIG_NVRAM=m
 CONFIG_N_GSM=m
 # CONFIG_OF is not set
@@ -360,7 +357,7 @@ CONFIG_R3964=m
 CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_REED_SOLOMON=m
-CONFIG_REGMAP_I2C=y
+CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TWL4030=m
@@ -435,8 +432,8 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIO=y
-CONFIG_SERIO_LIBPS2=y
 CONFIG_SFC=m
+CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m
 CONFIG_SGI_PARTITION=y
 # CONFIG_SG_SPLIT is not set

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index e25e282de92fead4938c18d7dbf3b8ff041c1453..f7ffb1fba1064fe8a867fc53a887a1979d51d803 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -2143,6 +2143,7 @@ CONFIG_I2C_DEBUG_CORE                           policy<{'amd64': 'n', 'arm64': '
 CONFIG_I2C_DEBUG_ALGO                           policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}>
 CONFIG_I2C_DEBUG_BUS                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}>
 #
+CONFIG_I2C                                      mark<ENFORCE> note<s390x lacks hw support for i2c>
 CONFIG_I2C_CHARDEV                              note<LP:1417032>
 
 # Menu: Device Drivers >> I2C support >> I2C support >> I2C Algorithms
@@ -7565,7 +7566,7 @@ CONFIG_REGULATOR_TPS65023                       policy<{'amd64': 'm', 'arm64': '
 CONFIG_REGULATOR_TPS6507X                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_REGULATOR_TPS65086                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_REGULATOR_TPS65090                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
-CONFIG_REGULATOR_TPS65217                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'y', 'i386': 'm', 's390x': 'm'}>
+CONFIG_REGULATOR_TPS65217                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'y', 'i386': 'm'}>
 CONFIG_REGULATOR_TPS65218                       policy<{'arm64': 'm', 'armhf': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_REGULATOR_TPS6524X                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_REGULATOR_TPS6586X                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 895b20cbc826b843cb456a1272aa4a6f50a3496c..fbb9edda0cd442c72f51a54ad0e8640271288bd6 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -175,7 +175,6 @@ CONFIG_HZ=250
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ_250=y
 CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_IMX=m
 CONFIG_I2C_SLAVE=y
@@ -217,6 +216,7 @@ CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
 CONFIG_MAC_PARTITION=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 CONFIG_MAILBOX=y
@@ -231,11 +231,9 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_SAS=m
 CONFIG_MEMORY=y
 CONFIG_MEMSTICK=m
-CONFIG_MFD_DA9063=y
+CONFIG_MFD_CORE=y
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_KEMPLD=m
-CONFIG_MFD_MAX14577=y
-CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MT6397=m
 CONFIG_MFD_RTSX_PCI=m
 CONFIG_MFD_SM501=m
@@ -243,8 +241,6 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 # CONFIG_MFD_TMIO is not set
 CONFIG_MFD_TPS65217=m
-CONFIG_MFD_TPS65912=y
-CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MII=y
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
@@ -323,6 +319,7 @@ CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA=y
 # CONFIG_NUMA_BALANCING is not set
+CONFIG_NVMEM=m
 CONFIG_N_GSM=m
 CONFIG_OF=y
 CONFIG_OMFS_FS=m
@@ -377,7 +374,7 @@ CONFIG_R3964=m
 CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_REED_SOLOMON=m
-CONFIG_REGMAP_I2C=y
+CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TWL4030=m
@@ -453,8 +450,8 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIO=y
-CONFIG_SERIO_LIBPS2=y
 CONFIG_SFC=m
+CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m
 CONFIG_SGI_PARTITION=y
 # CONFIG_SG_SPLIT is not set

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index c36c93a61346e1cf0d2099484094ec40685d5f24..6dee335794d4df871e5adbf5270616e6cd7d4f0c 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -160,7 +160,6 @@ CONFIG_HZ=250
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ_250=y
 CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_EMEV2=m
 CONFIG_I2C_IMX=y
 CONFIG_I2C_SLAVE=y
@@ -201,6 +200,7 @@ CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
 CONFIG_MAC_PARTITION=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 CONFIG_MAILBOX=y
@@ -215,11 +215,9 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_SAS=m
 CONFIG_MEMORY=y
 CONFIG_MEMSTICK=m
-CONFIG_MFD_DA9063=y
+CONFIG_MFD_CORE=y
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_KEMPLD=m
-CONFIG_MFD_MAX14577=y
-CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MT6397=m
 CONFIG_MFD_RTSX_PCI=m
 CONFIG_MFD_SM501=y
@@ -227,8 +225,6 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_TMIO=y
 CONFIG_MFD_TPS65217=y
-CONFIG_MFD_TPS65912=y
-CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
@@ -303,6 +299,7 @@ CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=4
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
+CONFIG_NVMEM=m
 CONFIG_NVRAM=m
 CONFIG_N_GSM=m
 CONFIG_OF=y
@@ -358,7 +355,7 @@ CONFIG_R3964=m
 CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_REED_SOLOMON=y
-CONFIG_REGMAP_I2C=y
+CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_TPS65217=y
 CONFIG_REISERFS_FS=m
@@ -431,8 +428,8 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIO=y
-CONFIG_SERIO_LIBPS2=y
 CONFIG_SFC=m
+CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m
 CONFIG_SGI_PARTITION=y
 CONFIG_SG_SPLIT=y

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index bbe5224989332417aa479e271f6ab028329ff4ef..4e88ded7db75de0f1e44f6192fdf917fb36e6c35 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3533,6 +3533,7 @@ CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_BRCMSTB=m
 # CONFIG_I2C_CADENCE is not set
 CONFIG_I2C_CBUS_GPIO=m
+CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CPM=m
 CONFIG_I2C_CROS_EC_TUNNEL=m
@@ -4607,7 +4608,6 @@ CONFIG_LOOPBACK_TARGET=m
 CONFIG_LOWMEM_CAM_NUM=3
 CONFIG_LOWMEM_SIZE=0x30000000
 CONFIG_LP8788_ADC=m
-CONFIG_LPC_SCH=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_LRU_CACHE=m
 CONFIG_LSI_ET1011C_PHY=m
@@ -4867,7 +4867,6 @@ CONFIG_MFD_ATMEL_HLCDC=m
 CONFIG_MFD_AXP20X=m
 CONFIG_MFD_AXP20X_I2C=m
 CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_CORE=y
 CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_CROS_EC_I2C=m
 CONFIG_MFD_CROS_EC_SPI=m
@@ -4877,6 +4876,7 @@ CONFIG_MFD_DA9052_I2C=y
 CONFIG_MFD_DA9052_SPI=y
 CONFIG_MFD_DA9055=y
 CONFIG_MFD_DA9062=m
+CONFIG_MFD_DA9063=y
 CONFIG_MFD_DA9150=m
 CONFIG_MFD_DLN2=m
 CONFIG_MFD_EXYNOS_LPASS=m
@@ -4890,8 +4890,10 @@ CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
 CONFIG_MFD_LM3533=m
 CONFIG_MFD_LP3943=m
 CONFIG_MFD_LP8788=y
+CONFIG_MFD_MAX14577=y
 CONFIG_MFD_MAX77620=y
 CONFIG_MFD_MAX77686=y
+CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MAX77843=y
 CONFIG_MFD_MAX8907=m
 CONFIG_MFD_MAX8925=y
@@ -4932,6 +4934,8 @@ CONFIG_MFD_TPS65090=y
 CONFIG_MFD_TPS65218=m
 CONFIG_MFD_TPS6586X=y
 CONFIG_MFD_TPS65910=y
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MFD_TPS65912_SPI=y
 CONFIG_MFD_TPS80031=y
 CONFIG_MFD_TWL4030_AUDIO=y
@@ -5899,7 +5903,6 @@ CONFIG_NVDIMM_PFN=y
 CONFIG_NVEC_PAZ00=m
 CONFIG_NVEC_POWER=m
 CONFIG_NVM=y
-CONFIG_NVMEM=m
 CONFIG_NVMEM_BCM_OCOTP=m
 CONFIG_NVMEM_IMX_OCOTP=m
 # CONFIG_NVMEM_VF610_OCOTP is not set
@@ -6774,11 +6777,11 @@ CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_AC97=m
+CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_SPMI=m
-CONFIG_REGULATOR=y
 CONFIG_REGULATOR_88PM800=m
 CONFIG_REGULATOR_88PM8607=m
 CONFIG_REGULATOR_AAT2870=m
@@ -7629,6 +7632,7 @@ CONFIG_SERIO_APBPS2=m
 CONFIG_SERIO_ARC_PS2=m
 CONFIG_SERIO_CT82C710=m
 CONFIG_SERIO_I8042=y
+CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_NVEC_PS2=m
 CONFIG_SERIO_PARKBD=m
 CONFIG_SERIO_PCIPS2=m
@@ -7636,7 +7640,6 @@ CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SERIO_XILINX_XPS_PS2=m
-CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_MCDI_MON=y

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index adc78e895979e4aeca71b4a825b502dbf8a09b2c..c25951e59b50bcc93a4e114eaff5819c7829bd59 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -158,7 +158,6 @@ CONFIG_HWMON=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 # CONFIG_HZ_100 is not set
 CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_SLAVE is not set
 CONFIG_I6300ESB_WDT=m
@@ -199,6 +198,7 @@ CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
 CONFIG_MAC_PARTITION=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 CONFIG_MAILBOX=y
@@ -214,11 +214,9 @@ CONFIG_MEGARAID_SAS=m
 CONFIG_MEMORY=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMSTICK=m
-CONFIG_MFD_DA9063=y
+CONFIG_MFD_CORE=y
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_KEMPLD=m
-CONFIG_MFD_MAX14577=y
-CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MT6397=m
 CONFIG_MFD_RTSX_PCI=m
 CONFIG_MFD_SM501=m
@@ -226,8 +224,6 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 # CONFIG_MFD_TMIO is not set
 CONFIG_MFD_TPS65217=m
-CONFIG_MFD_TPS65912=y
-CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
@@ -302,6 +298,7 @@ CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=8
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
+CONFIG_NVMEM=m
 CONFIG_NVRAM=m
 CONFIG_N_GSM=m
 # CONFIG_OF is not set
@@ -353,7 +350,7 @@ CONFIG_R3964=m
 CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_REED_SOLOMON=m
-CONFIG_REGMAP_I2C=y
+CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TWL4030=m
@@ -428,8 +425,8 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIO=y
-CONFIG_SERIO_LIBPS2=y
 CONFIG_SFC=m
+CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m
 CONFIG_SGI_PARTITION=y
 # CONFIG_SG_SPLIT is not set

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 461785e0e884f612582118bd2212422b37751b7d..0e36261c1812b903cf811a1f9deca66cb7b49b3a 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -130,7 +130,6 @@ CONFIG_HZ=250
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ_250=y
 CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_SLAVE is not set
 CONFIG_I6300ESB_WDT=m
@@ -172,6 +171,7 @@ CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_LPARCFG is not set
 CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
 CONFIG_MAC_PARTITION=y
 CONFIG_MAILBOX=y
 CONFIG_MATH_EMULATION=y
@@ -186,11 +186,9 @@ CONFIG_MEGARAID_SAS=m
 CONFIG_MEMORY=y
 CONFIG_MEMSTICK=m
 # CONFIG_MEM_SOFT_DIRTY is not set
-CONFIG_MFD_DA9063=y
+CONFIG_MFD_CORE=y
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_KEMPLD=m
-CONFIG_MFD_MAX14577=y
-CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MT6397=m
 CONFIG_MFD_RTSX_PCI=m
 CONFIG_MFD_SM501=m
@@ -198,8 +196,6 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MFD_TPS65217 is not set
-CONFIG_MFD_TPS65912=y
-CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
@@ -274,6 +270,7 @@ CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_NVMEM=m
 CONFIG_NVRAM=y
 CONFIG_N_GSM=m
 CONFIG_OF=y
@@ -328,7 +325,7 @@ CONFIG_R3964=m
 CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_REED_SOLOMON=m
-CONFIG_REGMAP_I2C=y
+CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REGULATOR_TWL4030=m
 CONFIG_REISERFS_FS=m
@@ -399,8 +396,8 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIO=y
-CONFIG_SERIO_LIBPS2=y
 CONFIG_SFC=m
+CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m
 CONFIG_SGI_PARTITION=y
 # CONFIG_SG_SPLIT is not set

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 7d32091d0bf284ae42ec52a254b6761d23dbec3c..6a61a4c5f6ff46ea5b70aee54464f31b0ffc1fba 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -165,7 +165,6 @@ CONFIG_HZ=250
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ_250=y
 CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_SLAVE is not set
 CONFIG_I6300ESB_WDT=m
 CONFIG_IBMVETH=y
@@ -210,6 +209,7 @@ CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LPARCFG=y
 CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
 CONFIG_MAC_PARTITION=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 CONFIG_MAILBOX=y
@@ -226,11 +226,9 @@ CONFIG_MEMORY=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMSTICK=m
 # CONFIG_MEM_SOFT_DIRTY is not set
-CONFIG_MFD_DA9063=y
+CONFIG_MFD_CORE=y
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_KEMPLD=m
-CONFIG_MFD_MAX14577=y
-CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MT6397=m
 CONFIG_MFD_RTSX_PCI=m
 CONFIG_MFD_SM501=m
@@ -238,8 +236,6 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MFD_TPS65217 is not set
-CONFIG_MFD_TPS65912=y
-CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
@@ -323,6 +319,7 @@ CONFIG_NTB=m
 CONFIG_NUMA=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_NVMEM=m
 CONFIG_N_GSM=m
 CONFIG_OF=y
 CONFIG_OMFS_FS=m
@@ -398,7 +395,7 @@ CONFIG_R3964=m
 CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_REED_SOLOMON=m
-CONFIG_REGMAP_I2C=y
+CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REGULATOR_TWL4030=m
 CONFIG_REISERFS_FS=m
@@ -472,8 +469,8 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIO=y
-CONFIG_SERIO_LIBPS2=y
 CONFIG_SFC=m
+CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m
 CONFIG_SGI_PARTITION=y
 # CONFIG_SG_SPLIT is not set

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index d4cfe6295fca9843da7c4dabf1319217c4c7b524..cda5965a7ae44b2c278ac054ce0e3b7d96807a1b 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -123,9 +123,7 @@ CONFIG_HZ=100
 CONFIG_HZ_100=y
 # CONFIG_HZ_1000 is not set
 # CONFIG_HZ_250 is not set
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_SLAVE is not set
+# CONFIG_I2C is not set
 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_IEEE802154 is not set
 # CONFIG_IIO is not set
@@ -161,6 +159,7 @@ CONFIG_KVM=y
 # CONFIG_LLC2 is not set
 CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_LPC_ICH is not set
+# CONFIG_LPC_SCH is not set
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 # CONFIG_MAILBOX is not set
@@ -175,20 +174,15 @@ CONFIG_MD_MULTIPATH=y
 CONFIG_MEMORY_HOTPLUG=y
 # CONFIG_MEMSTICK is not set
 CONFIG_MEM_SOFT_DIRTY=y
-CONFIG_MFD_DA9063=m
+CONFIG_MFD_CORE=m
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
-CONFIG_MFD_MAX14577=m
-CONFIG_MFD_MAX77693=m
 # CONFIG_MFD_MT6397 is not set
 # CONFIG_MFD_RTSX_PCI is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_TMIO is not set
-CONFIG_MFD_TPS65217=m
-CONFIG_MFD_TPS65912=m
-CONFIG_MFD_TPS65912_I2C=m
 # CONFIG_MINIX_FS is not set
 # CONFIG_MINIX_SUBPARTITION is not set
 # CONFIG_MMC is not set
@@ -254,6 +248,7 @@ CONFIG_NUMA=y
 CONFIG_NUMA_BALANCING=y
 # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
 CONFIG_NUMA_EMU=y
+# CONFIG_NVMEM is not set
 # CONFIG_N_GSM is not set
 # CONFIG_OF is not set
 # CONFIG_OMFS_FS is not set
@@ -295,9 +290,7 @@ CONFIG_PTP_1588_CLOCK=m
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
-CONFIG_REGMAP_I2C=m
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REGULATOR_TPS65217=m
+# CONFIG_REGULATOR is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_RESET_CONTROLLER is not set
 # CONFIG_RFKILL is not set
@@ -356,9 +349,9 @@ CONFIG_SERIAL_CORE=m
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_SERIAL_RP2 is not set
 # CONFIG_SERIAL_SCCNXP is not set
-CONFIG_SERIO=m
-CONFIG_SERIO_LIBPS2=m
+# CONFIG_SERIO is not set
 # CONFIG_SFC is not set
+# CONFIG_SFC_FALCON is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_SGI_PARTITION is not set
 # CONFIG_SG_SPLIT is not set
@@ -379,9 +372,6 @@ CONFIG_STANDALONE=y
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_SYSV_FS is not set
 CONFIG_SYS_HYPERVISOR=y
-CONFIG_TCG_TIS_I2C_ATMEL=m
-CONFIG_TCG_TIS_I2C_INFINEON=m
-CONFIG_TCG_TIS_I2C_NUVOTON=m
 CONFIG_TEST_BITMAP=m
 CONFIG_TEST_PRINTF=m
 # CONFIG_THERMAL is not set