diff options
| author | Jeremy Cline <jeremy@jcline.org> | 2018-04-19 11:32:55 -0400 |
|---|---|---|
| committer | Jeremy Cline <jeremy@jcline.org> | 2018-04-19 11:32:55 -0400 |
| commit | 82a7e3d2645e8f544d860e54f14808d5f3f6f2a3 (patch) | |
| tree | df87dbe775db7a54c0744acfe28cdfb69d9d5052 | |
| parent | 70031950131a5a4bf9ea93f0922b225d4c0bcb7d (diff) | |
| download | kernel-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.
| -rw-r--r-- | configs/fedora/generic/s390x/CONFIG_DRM | 1 | ||||
| -rw-r--r-- | kernel-s390x-debug.config | 2 | ||||
| -rw-r--r-- | kernel-s390x.config | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/configs/fedora/generic/s390x/CONFIG_DRM b/configs/fedora/generic/s390x/CONFIG_DRM new file mode 100644 index 000000000..c9d4b0f66 --- /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 a4ab1a0e4..7366eb465 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 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 |