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

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

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