summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-01-04 10:50:46 +0000
committerPeter Robinson <pbrobinson@gmail.com>2019-01-04 10:50:46 +0000
commitd9b49b04ca5b591d2db1b291f3d9e07784eab9b4 (patch)
treeaa95ba18b74c2ba7a76fcdb93416e7a2cc469e72 /kernel-s390x.config
parent3220c13b711f8850aecdafaba308ac709b80b528 (diff)
downloadkernel-d9b49b04ca5b591d2db1b291f3d9e07784eab9b4.tar.gz
kernel-d9b49b04ca5b591d2db1b291f3d9e07784eab9b4.tar.xz
kernel-d9b49b04ca5b591d2db1b291f3d9e07784eab9b4.zip
Arm updates for 4.20
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config10
1 files changed, 1 insertions, 9 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index e6dd96aa9..be6f88d5b 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -631,7 +631,6 @@ CONFIG_CAN_SOFTING=m
# CONFIG_CAN_UCAN is not set
CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
-# CONFIG_CAN_XILINXCAN is not set
CONFIG_CAPI_AVM=y
# CONFIG_CAPI_EICON is not set
# CONFIG_CAPI_TRACE is not set
@@ -1151,7 +1150,7 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
# CONFIG_DRM_PANEL_LVDS is not set
CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
-CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
@@ -4833,13 +4832,6 @@ CONFIG_SND=m
CONFIG_SND_MAESTRO3_INPUT=y
CONFIG_SND_MAESTRO3=m
CONFIG_SND_MAX_CARDS=32
-# CONFIG_SND_MESON_AXG_FRDDR is not set
-# CONFIG_SND_MESON_AXG_PDM is not set
-# CONFIG_SND_MESON_AXG_SOUND_CARD is not set
-# CONFIG_SND_MESON_AXG_SPDIFOUT is not set
-# CONFIG_SND_MESON_AXG_TDMIN is not set
-# CONFIG_SND_MESON_AXG_TDMOUT is not set
-# CONFIG_SND_MESON_AXG_TODDR is not set
CONFIG_SND_MIA=m
CONFIG_SND_MIXART=m
CONFIG_SND_MIXER_OSS=m