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

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

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