diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-10-18 16:33:42 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-10-18 16:33:42 +0200 |
| commit | ee961c967cee116be731cc3b40e7b668b30feb07 (patch) | |
| tree | a6518e655c51649262cb53cde9519b5219fdeaff /kernel-s390x.config | |
| parent | 8d212c516d169d2a4178035dfe8c6f2992b82cb5 (diff) | |
| parent | d82fe1b5f1ca422abf9b8ad9032d4ac3e54aaf84 (diff) | |
| download | kernel-ee961c967cee116be731cc3b40e7b668b30feb07.tar.gz kernel-ee961c967cee116be731cc3b40e7b668b30feb07.tar.xz kernel-ee961c967cee116be731cc3b40e7b668b30feb07.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.4.0-0.rc3.git2.1.vanilla.knurd.1.fc31
Diffstat (limited to 'kernel-s390x.config')
| -rw-r--r-- | kernel-s390x.config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index 263ad26a4..7a75cfa0e 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1207,7 +1207,7 @@ CONFIG_DRM_RADEON_USERPTR=y # CONFIG_DRM_SII902X is not set CONFIG_DRM_SII9234=m # CONFIG_DRM_SIL_SII8620 is not set -# CONFIG_DRM_TDFX=n is not set +# CONFIG_DRM_TDFX is not set # CONFIG_DRM_THINE_THC63LVD1024 is not set CONFIG_DRM_TI_SN65DSI86=m CONFIG_DRM_TI_TFP410=m @@ -5742,7 +5742,6 @@ CONFIG_USB_PWC=m # CONFIG_USB_R8A66597_HCD is not set CONFIG_USB_RAINSHADOW_CEC=m # CONFIG_USB_RAREMONO is not set -# CONFIG_USB_RIO500 is not set CONFIG_USB_ROLE_SWITCH=m CONFIG_USB_RTL8150=m CONFIG_USB_RTL8152=m |