upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / drivers / char / drm / Kconfig

diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
index 15b1d12..d9a0299 100644 (file)
--- a/drivers/char/drm/Kconfig
+++ b/drivers/char/drm/Kconfig
@@ -5,7 +5,8 @@
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 #
 config DRM
-       bool "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
+       tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
+       depends on AGP || AGP=n
        help
          Kernel-level support for the Direct Rendering Infrastructure (DRI)
          introduced in XFree86 4.0. If you say Y here, you need to select
@@ -17,7 +18,7 @@ config DRM
 
 config DRM_TDFX
        tristate "3dfx Banshee/Voodoo3+"
-       depends on DRM
+       depends on DRM && PCI
        help
          Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
          graphics card.  If M is selected, the module will be called tdfx.