summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-02-17 10:18:24 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-02-17 10:18:24 -0500
commit08f431fa3ad32081c754b2ba5346eb1337a63b89 (patch)
tree031cba201cd5612ec8a1a64a38d7ee1e73a7030d /config-generic
parentc438599162b0da1365ac1ea1a03e16586fc47e77 (diff)
downloadkernel-08f431fa3ad32081c754b2ba5346eb1337a63b89.tar.gz
kernel-08f431fa3ad32081c754b2ba5346eb1337a63b89.tar.xz
kernel-08f431fa3ad32081c754b2ba5346eb1337a63b89.zip
Linux v3.19-7478-g796e1c55717e
- DRM merge
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic4
1 files changed, 4 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index c2ed9b896..ba81c1527 100644
--- a/config-generic
+++ b/config-generic
@@ -3036,6 +3036,9 @@ CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_QXL=m
CONFIG_DRM_BOCHS=m
CONFIG_DRM_PTN3460=m
+# CONFIG_DRM_PANEL is not set
+# CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_S6E8AA0 is not set
#
# PCMCIA character devices
@@ -5422,6 +5425,7 @@ CONFIG_POWERCAP=y
# CONFIG_CPU_IDLE is not set
# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
+# CONFIG_ASM9260_TIMER is not set
# CONFIG_HMC_DRV is not set