summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-01-27 10:05:41 -0500
committerJosh Boyer <jwboyer@redhat.com>2012-01-27 10:05:41 -0500
commit30a3098cab7d9a0941084735b04edf5fffd6dc89 (patch)
tree2c3572207df7f50f92ce7842699c1605ffb5a710 /config-generic
parent14c5ae909dd6409fac2509270fbd7d4cc143d757 (diff)
downloadkernel-30a3098cab7d9a0941084735b04edf5fffd6dc89.tar.gz
kernel-30a3098cab7d9a0941084735b04edf5fffd6dc89.tar.xz
kernel-30a3098cab7d9a0941084735b04edf5fffd6dc89.zip
Linux 3.3-rc1-git4 (upstream 74ea15d909b31158f9b63190a95b52bc05586d4b)
Enable the non-staging GMA500 driver (rhbz 785053)
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic5
1 files changed, 1 insertions, 4 deletions
diff --git a/config-generic b/config-generic
index f9a8ee4d4..9d8082cd9 100644
--- a/config-generic
+++ b/config-generic
@@ -2410,10 +2410,7 @@ CONFIG_DRM_I915_KMS=y
CONFIG_DRM_NOUVEAU=m
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_NOUVEAU_DEBUG=y
-CONFIG_DRM_PSB=m
-# CONFIG_DRM_PSB_MRST is not set
-# CONFIG_DRM_PSB_MFLD is not set
-# CONFIG_DRM_PSB_CDV is not set
+# CONFIG_DRM_PSB is not set
CONFIG_DRM_I2C_CH7006=m
CONFIG_DRM_I2C_SIL164=m
CONFIG_DRM_VMWGFX=m