summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-05-20 08:47:57 +0100
committerPeter Robinson <pbrobinson@gmail.com>2019-05-20 08:47:57 +0100
commit37f7d8a33541864e227af73e90db75a3ddb2c628 (patch)
tree960550ad0d80f5bedeb68155e9fab3ed7e8c0563 /kernel-s390x.config
parent58561782e9352f5d440e0f19744dc75a7a27af20 (diff)
downloadkernel-37f7d8a33541864e227af73e90db75a3ddb2c628.tar.gz
kernel-37f7d8a33541864e227af73e90db75a3ddb2c628.tar.xz
kernel-37f7d8a33541864e227af73e90db75a3ddb2c628.zip
Arm config updates for 5.2rc1
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index c028ec4af..0fba56161 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2829,7 +2829,7 @@ CONFIG_MFD_MAX77650=m
CONFIG_MFD_SM501_GPIO=y
# CONFIG_MFD_SM501 is not set
# CONFIG_MFD_SMSC is not set
-CONFIG_MFD_STMFX=m
+# CONFIG_MFD_STMFX is not set
# CONFIG_MFD_STMPE is not set
# CONFIG_MFD_STPMIC1 is not set
# CONFIG_MFD_SYSCON is not set
@@ -4607,6 +4607,7 @@ CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NTC_THERMISTOR=m
# CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_OCC_P9_SBE is not set
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m
@@ -4957,7 +4958,7 @@ CONFIG_SND_SOC_HDAC_HDA=m
CONFIG_SND_SOC_HDAC_HDMI=m
CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_IMX_AUDMIX=m
+# CONFIG_SND_SOC_IMX_AUDMIX is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
# CONFIG_SND_SOC_IMX_ES8328 is not set
# CONFIG_SND_SOC_INNO_RK3036 is not set
@@ -5314,7 +5315,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
# CONFIG_THERMAL_GOV_USER_SPACE is not set
CONFIG_THERMAL_HWMON=y
# CONFIG_THERMAL is not set
-CONFIG_THERMAL_MMIO=m
+# CONFIG_THERMAL_MMIO is not set
# CONFIG_THERMAL_OF is not set
CONFIG_THERMAL_STATISTICS=y
# CONFIG_THERMAL_WRITABLE_TRIPS is not set