From 2f9ac97623fc5ff5e2b3744261ccae2fee35f3a0 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Mon, 30 Jan 2012 12:59:49 -0500 Subject: [PATCH] Restore the Savage DRM and several others that were accidentally early-deprecated. --- config-generic | 24 +++++++++--------------- kernel.spec | 4 ++++ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/config-generic b/config-generic index bd2c47654..025b58cde 100644 --- a/config-generic +++ b/config-generic @@ -2511,31 +2511,25 @@ CONFIG_AGP_SIS=y CONFIG_AGP_SWORKS=y CONFIG_AGP_VIA=y CONFIG_AGP_EFFICEON=y - CONFIG_VGA_ARB=y CONFIG_VGA_ARB_MAX_GPUS=16 - -# CONFIG_STUB_POULSBO is not set - +CONFIG_STUB_POULSBO=m +# CONFIG_DRM_PSB is not set CONFIG_DRM=m -# CONFIG_DRM_TDFX is not set -# CONFIG_DRM_R128 is not set +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_KMS=y -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_MGA is not set -# CONFIG_DRM_SIS is not set -# CONFIG_DRM_SAVAGE is not set +CONFIG_DRM_I810=m +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_SAVAGE=m CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y -# CONFIG_DRM_VIA is not set +CONFIG_DRM_VIA=m 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_I2C_CH7006=m CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_VMWGFX=m diff --git a/kernel.spec b/kernel.spec index 7c2bd3bc2..a391201a0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2305,6 +2305,10 @@ fi # and build. %changelog +* Mon Jan 30 2012 Dave Jones +- Restore the Savage DRM and several others that were accidentally + early-deprecated. + * Mon Jan 30 2012 John W. Linville - Use the eeprom_93cx6 driver from the compat-wireless package - mac80211: fix debugfs key->station symlink