From 82a7e3d2645e8f544d860e54f14808d5f3f6f2a3 Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jeremy@jcline.org>
Date: Apr 19 2018 15:32:55 +0000
Subject: Revert "Enable CONFIG_DRM on s390x (rhbz 1569086)"


It turns out this depends on CONFIG_VT which depends on !S390

This reverts commit c45e5994bf27033db30d7b6987c555bb42907ac9.

---

diff --git a/configs/fedora/generic/s390x/CONFIG_DRM b/configs/fedora/generic/s390x/CONFIG_DRM
new file mode 100644
index 0000000..c9d4b0f
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_DRM
@@ -0,0 +1 @@
+# CONFIG_DRM is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index a4ab1a0..7366eb4 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1087,10 +1087,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
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 7b03cb7..6e63791 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