From 2b37c3cfba6d7693260f1edeca365324b52c9fa8 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 5 Jan 2012 15:45:43 -0500 Subject: [PATCH] Disable unsupported DRI1-only DRM drivers: i810, r128, tdfx --- config-generic | 6 +++--- kernel.spec | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config-generic b/config-generic index 5091ea231..de763aa56 100644 --- a/config-generic +++ b/config-generic @@ -2518,11 +2518,11 @@ CONFIG_VGA_ARB=y CONFIG_VGA_ARB_MAX_GPUS=16 # CONFIG_STUB_POULSBO is not set CONFIG_DRM=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m +# CONFIG_DRM_TDFX is not set +# CONFIG_DRM_R128 is not set CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_KMS=y -CONFIG_DRM_I810=m +# CONFIG_DRM_I810 is not set # CONFIG_DRM_MGA is not set # CONFIG_DRM_SIS is not set # CONFIG_DRM_SAVAGE is not set diff --git a/kernel.spec b/kernel.spec index a36276f1e..5343092c1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2289,6 +2289,9 @@ fi # ||----w | # || || %changelog +* Thu Jan 05 2012 Adam Jackson +- Disable unsupported DRI1-only DRM drivers: i810, r128, tdfx + * Thu Jan 05 2012 John W. Linville - Patch compat-wireless build to avoid "pr_fmt redefined" warnings - Disable CONFIG_BRCMFMAC builds (needs unknown symbol __bad_udelay)