vserver 2.0 rc7

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

diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index 4e673b0..7f8c1b5 100644 (file)
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -1,6 +1,6 @@
 config AGP
        tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU
-       depends on ALPHA || IA64 || PPC32 || X86
+       depends on ALPHA || IA64 || PPC || X86
        default y if GART_IOMMU
        ---help---
          AGP (Accelerated Graphics Port) is a bus system mainly used to
@@ -78,7 +78,7 @@ config AGP_AMD64
 
 config AGP_INTEL
        tristate "Intel 440LX/BX/GX, I8xx and E7x05 chipset support"
-       depends on AGP && X86 && !X86_64
+       depends on AGP && X86
        help
          This option gives you AGP support for the GLX component of XFree86 4.x
          on Intel 440LX/BX/GX, 815, 820, 830, 840, 845, 850, 860, 875,
@@ -89,16 +89,6 @@ config AGP_INTEL
          use GLX or DRI, or if you have any Intel integrated graphics
          chipsets.  If unsure, say Y.
 
-config AGP_INTEL_MCH
-       tristate "Intel i865 chipset support"
-       depends on AGP && X86
-       help
-         This option gives you AGP support for the GLX component of XFree86 4.x
-         on Intel chipsets that support Intel EM64T processors.
-
-         You should say Y here if you use XFree86 3.3.6 or 4.x and want to
-         use GLX or DRI.  If unsure, say Y.
-
 config AGP_NVIDIA
        tristate "NVIDIA nForce/nForce2 chipset support"
        depends on AGP && X86 && !X86_64
@@ -156,11 +146,11 @@ config AGP_ALPHA_CORE
        default AGP
 
 config AGP_UNINORTH
-       tristate "Apple UniNorth AGP support"
+       tristate "Apple UniNorth & U3 AGP support"
        depends on AGP && PPC_PMAC
        help
          This option gives you AGP support for Apple machines with a
-         UniNorth bridge.
+         UniNorth or U3 (Apple G5) bridge.
 
 config AGP_EFFICEON
        tristate "Transmeta Efficeon support"
@@ -172,3 +162,10 @@ config AGP_EFFICEON
          You should say Y here if you use XFree86 3.3.6 or 4.x and want to
          use GLX or DRI.  If unsure, say Y.
 
+config AGP_SGI_TIOCA
+        tristate "SGI TIO chipset AGP support"
+        depends on AGP && (IA64_SGI_SN2 || IA64_GENERIC)
+        help
+          This option gives you AGP GART support for the SGI TIO chipset
+          for IA64 processors.
+