summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorJeremy Cline <jeremy@jcline.org>2018-04-19 11:50:06 -0400
committerJeremy Cline <jeremy@jcline.org>2018-04-19 11:50:24 -0400
commit8abaa9101d6310636fc5ac963e068d0da2a161ec (patch)
tree7b572bc9c9c4d83e38ef5132c1312c08308cc4de /kernel-s390x.config
parent0ec9f4d319b8d6233baeb0648858ccb51fe1b98e (diff)
downloadkernel-8abaa9101d6310636fc5ac963e068d0da2a161ec.tar.gz
kernel-8abaa9101d6310636fc5ac963e068d0da2a161ec.tar.xz
kernel-8abaa9101d6310636fc5ac963e068d0da2a161ec.zip
Revert "Enable CONFIG_DRM on s390x (rhbz 1569086)"
It turns out this depends on CONFIG_VT which depends on !S390 This reverts commit 0ec9f4d319b8d6233baeb0648858ccb51fe1b98e.
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 7821c24fc..d40aa520f 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1064,10 +1064,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