summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2012-01-05 15:45:43 -0500
committerAdam Jackson <ajax@redhat.com>2012-01-05 15:45:43 -0500
commit2b37c3cfba6d7693260f1edeca365324b52c9fa8 (patch)
treef1c0351837d99b7f29a6f0923e99377919b2ee69
parent7fee57a29682911a8eb2a3ff8e2a0d3b5a45e657 (diff)
downloadkernel-2b37c3cfba6d7693260f1edeca365324b52c9fa8.tar.gz
kernel-2b37c3cfba6d7693260f1edeca365324b52c9fa8.tar.xz
kernel-2b37c3cfba6d7693260f1edeca365324b52c9fa8.zip
Disable unsupported DRI1-only DRM drivers: i810, r128, tdfx
-rw-r--r--config-generic6
-rw-r--r--kernel.spec3
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 <ajax@redhat.com>
+- Disable unsupported DRI1-only DRM drivers: i810, r128, tdfx
+
* Thu Jan 05 2012 John W. Linville <linville@redhat.com>
- Patch compat-wireless build to avoid "pr_fmt redefined" warnings
- Disable CONFIG_BRCMFMAC builds (needs unknown symbol __bad_udelay)