summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorJeremy Cline <jeremy@jcline.org>2018-04-19 11:32:55 -0400
committerJeremy Cline <jeremy@jcline.org>2018-04-19 11:32:55 -0400
commit82a7e3d2645e8f544d860e54f14808d5f3f6f2a3 (patch)
treedf87dbe775db7a54c0744acfe28cdfb69d9d5052 /kernel-s390x.config
parent70031950131a5a4bf9ea93f0922b225d4c0bcb7d (diff)
downloadkernel-82a7e3d2645e8f544d860e54f14808d5f3f6f2a3.tar.gz
kernel-82a7e3d2645e8f544d860e54f14808d5f3f6f2a3.tar.xz
kernel-82a7e3d2645e8f544d860e54f14808d5f3f6f2a3.zip
Revert "Enable CONFIG_DRM on s390x (rhbz 1569086)"
It turns out this depends on CONFIG_VT which depends on !S390 This reverts commit c45e5994bf27033db30d7b6987c555bb42907ac9.
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 7b03cb78e..6e63791c1 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1076,10 +1076,10 @@ CONFIG_DRM_I2C_ADV7533=y
CONFIG_DRM_I2C_CH7006=m
CONFIG_DRM_I2C_NXP_TDA998X=m
CONFIG_DRM_I2C_SIL164=m
+# CONFIG_DRM is not set
# CONFIG_DRM_LEGACY is not set
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
# CONFIG_DRM_LVDS_ENCODER is not set
-CONFIG_DRM=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
CONFIG_DRM_MGAG200=m
# CONFIG_DRM_MGA is not set