summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-04-20 20:36:25 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-04-20 20:37:31 -0400
commitcbe4b5e00edb34c3c1b4acdb800f230062eb2b47 (patch)
treec0b148309f62983f264cb3cd305279aee74d1446 /config-generic
parentc8c04852223c8f192e9e33234b792f115dd32ddb (diff)
downloadkernel-cbe4b5e00edb34c3c1b4acdb800f230062eb2b47.tar.gz
kernel-cbe4b5e00edb34c3c1b4acdb800f230062eb2b47.tar.xz
kernel-cbe4b5e00edb34c3c1b4acdb800f230062eb2b47.zip
Linux v4.0-8962-g14aa02449064
DRM merge
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic3
1 files changed, 3 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index b32831c8f..5c48d02ac 100644
--- a/config-generic
+++ b/config-generic
@@ -3043,6 +3043,7 @@ CONFIG_DRM_CIRRUS_QEMU=m # do not enable on f17 or older
# CONFIG_DRM_TDFX is not set
# CONFIG_DRM_R128 is not set
CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RADEON_UMS is not set
# CONFIG_DRM_I810 is not set
# CONFIG_DRM_MGA is not set
@@ -3068,9 +3069,11 @@ CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_QXL=m
CONFIG_DRM_BOCHS=m
CONFIG_DRM_PTN3460=m
+CONFIG_DRM_PS8622=m
# CONFIG_DRM_PANEL is not set
# CONFIG_DRM_PANEL_SIMPLE is not set
# CONFIG_DRM_PANEL_S6E8AA0 is not set
+CONFIG_DRM_VGEM=m
#
# PCMCIA character devices