vserver 1.9.5.x5

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

diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
index 087ad5d..4caf683 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
@@ -24,14 +25,14 @@ config DRM_TDFX
 
 config DRM_GAMMA
        tristate "3dlabs GMX 2000"
-       depends on DRM
+       depends on DRM && BROKEN
        help
          This is the old gamma driver, please tell me if it might actually
          work.
 
 config DRM_R128
        tristate "ATI Rage 128"
-       depends on DRM
+       depends on DRM && PCI
        help
          Choose this option if you have an ATI Rage 128 graphics card.  If M
          is selected, the module will be called r128.  AGP support for
@@ -39,7 +40,7 @@ config DRM_R128
 
 config DRM_RADEON
        tristate "ATI Radeon"
-       depends on DRM
+       depends on DRM && PCI
        help
          Choose this option if you have an ATI Radeon graphics card.  There
          are both PCI and AGP versions.  You don't need to choose this to
@@ -55,18 +56,33 @@ config DRM_I810
          selected, the module will be called i810.  AGP support is required
          for this driver to work.
 
-config DRM_I830
-       tristate "Intel 830M, 845G, 852GM, 855GM, 865G"
+choice
+       prompt "Intel 830M, 845G, 852GM, 855GM, 865G"
        depends on DRM && AGP && AGP_INTEL
+       optional
+
+config DRM_I830
+       tristate "i830 driver"
        help
          Choose this option if you have a system that has Intel 830M, 845G,
          852GM, 855GM or 865G integrated graphics.  If M is selected, the
          module will be called i830.  AGP support is required for this driver
-         to work.
+         to work. This driver will eventually be replaced by the i915 one.
+
+config DRM_I915
+       tristate "i915 driver"
+       help
+         Choose this option if you have a system that has Intel 830M, 845G,
+         852GM, 855GM 865G or 915G integrated graphics.  If M is selected, the
+         module will be called i915.  AGP support is required for this driver
+         to work. This driver will eventually replace the I830 driver, when
+         later release of X start to use the new DDX and DRI.
+       
+endchoice
 
 config DRM_MGA
        tristate "Matrox g200/g400"
-       depends on DRM && AGP && (!X86_64 || BROKEN) 
+       depends on DRM && AGP
        help
          Choose this option if you have a Matrox G200, G400 or G450 graphics
          card.  If M is selected, the module will be called mga.  AGP
@@ -76,7 +92,7 @@ config DRM_SIS
        tristate "SiS video cards"
        depends on DRM && AGP
        help
-         Choose this option if you have a SiS 630 or compatibel video 
+         Choose this option if you have a SiS 630 or compatible video 
           chipset. If M is selected the module will be called sis. AGP
           support is required for this driver to work.