diff options
author | Josh Boyer <jwboyer@redhat.com> | 2012-01-27 10:05:41 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2012-01-27 10:05:41 -0500 |
commit | 30a3098cab7d9a0941084735b04edf5fffd6dc89 (patch) | |
tree | 2c3572207df7f50f92ce7842699c1605ffb5a710 /config-x86-generic | |
parent | 14c5ae909dd6409fac2509270fbd7d4cc143d757 (diff) | |
download | kernel-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-x86-generic')
-rw-r--r-- | config-x86-generic | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config-x86-generic b/config-x86-generic index d3fe36502..6a7d1f767 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -396,8 +396,9 @@ CONFIG_RELOCATABLE=y # Depends on HOTPLUG_PCI_PCIE CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m -# Figure out how this relates to DRM_PSB in staging because confused -# CONFIG_DRM_GMA500 is not set +CONFIG_DRM_GMA500=m +# CONFIG_DRM_GMA600 is not set +# CONFIG_DRM_GMA3600 is not set # Maybe enable in debug kernels? # CONFIG_DEBUG_NMI_SELFTEST is not set |