diff options
author | Jeremy Cline <jeremy@jcline.org> | 2018-04-19 11:50:06 -0400 |
---|---|---|
committer | Jeremy Cline <jeremy@jcline.org> | 2018-04-19 11:50:24 -0400 |
commit | 8abaa9101d6310636fc5ac963e068d0da2a161ec (patch) | |
tree | 7b572bc9c9c4d83e38ef5132c1312c08308cc4de | |
parent | 0ec9f4d319b8d6233baeb0648858ccb51fe1b98e (diff) | |
download | kernel-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.
-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 ba519dbc9..312ab50fe 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1075,10 +1075,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 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 |