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

[mirror_ubuntu-zesty-kernel.git] / debian.master / config / amd64 / config.common.amd64

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