summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorJeremy Cline <jcline@redhat.com>2019-03-12 14:57:08 +0000
committerJeremy Cline <jcline@redhat.com>2019-03-12 15:02:18 +0000
commitfe3f29352b50ab76164e008a657daaf01d61f48c (patch)
treee91711efb7acd777630afad35c0c74b9c12cb122 /kernel-s390x.config
parent88d17afb2447cdfd4235c04a28bdd232cce43f83 (diff)
downloadkernel-fe3f29352b50ab76164e008a657daaf01d61f48c.tar.gz
kernel-fe3f29352b50ab76164e008a657daaf01d61f48c.tar.xz
kernel-fe3f29352b50ab76164e008a657daaf01d61f48c.zip
Linux v5.0-10742-gea295481b6e3
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 878e3c16f..0b1e3ace9 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2024,6 +2024,7 @@ CONFIG_INPUT_LEDS=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_MSM_VIBRATOR is not set
# CONFIG_INPUT_PCF8574 is not set
CONFIG_INPUT_PCSPKR=m
CONFIG_INPUT_PM8XXX_VIBRATOR=m
@@ -2861,6 +2862,7 @@ CONFIG_MLXSW_SPECTRUM_DCB=y
CONFIG_MLXSW_SPECTRUM=m
CONFIG_MLXSW_SWITCHIB=m
CONFIG_MLXSW_SWITCHX2=m
+CONFIG_MLX_WDT=m
# CONFIG_MMA7455_I2C is not set
# CONFIG_MMA7455_SPI is not set
CONFIG_MMA7660=m