drm: make drm_io_prot static.

[powerpc.git] / drivers / char / drm / Kconfig

diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
index d6c5031..ef833a1 100644 (file)
--- a/drivers/char/drm/Kconfig
+++ b/drivers/char/drm/Kconfig
@@ -23,13 +23,6 @@ config DRM_TDFX
          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.
 
-config DRM_GAMMA
-       tristate "3dlabs GMX 2000"
-       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 && PCI
@@ -44,8 +37,8 @@ config DRM_RADEON
        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
-         run the Radeon in plain VGA mode.  There is a product page at
-         <http://www.ati.com/na/pages/products/pc/radeon32/index.html>.
+         run the Radeon in plain VGA mode.
+         
          If M is selected, the module will be called radeon.
 
 config DRM_I810
@@ -67,7 +60,9 @@ config DRM_I830
          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. This driver will eventually be replaced by the i915 one.
+         to work. This driver is used by the older X releases X.org 6.7 and
+         XFree86 4.3. If unsure, build this and i915 as modules and the X server
+         will load the correct one.
 
 config DRM_I915
        tristate "i915 driver"
@@ -75,8 +70,9 @@ config DRM_I915
          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.
+         to work. This driver is used by the Intel driver in X.org 6.8 and
+         XFree86 4.4 and above. If unsure, build this and i830 as modules and 
+         the X server will load the correct one.
        
 endchoice
 
@@ -103,3 +99,10 @@ config DRM_VIA
          Choose this option if you have a Via unichrome or compatible video
          chipset. If M is selected the module will be called via.
 
+config DRM_SAVAGE
+       tristate "Savage video cards"
+       depends on DRM
+       help
+         Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
+         chipset. If M is selected the module will be called savage.
+