vserver 1.9.5.x5

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

diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index 773279d..4e673b0 100644 (file)
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -1,5 +1,6 @@
 config AGP
 config AGP

-       tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU && !M68K
+       tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU
+       depends on ALPHA || IA64 || PPC32 || X86

        default y if GART_IOMMU
        ---help---
          AGP (Accelerated Graphics Port) is a bus system mainly used to
        default y if GART_IOMMU
        ---help---
          AGP (Accelerated Graphics Port) is a bus system mainly used to


@@ -130,7 +131,7 @@ config AGP_VIA
        depends on AGP && X86 && !X86_64
        help
          This option gives you AGP support for the GLX component of
        depends on AGP && X86 && !X86_64
        help
          This option gives you AGP support for the GLX component of

-         XFree86 4.x on VIA MPV3/Apollo Pro chipsets.
+         XFree86 4.x on VIA MVP3/Apollo Pro chipsets.

 
          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 N.
 
          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 N.


@@ -144,7 +145,7 @@ config AGP_I460
 
 config AGP_HP_ZX1
        tristate "HP ZX1 chipset AGP support"
 
 config AGP_HP_ZX1
        tristate "HP ZX1 chipset AGP support"

-       depends on AGP && (IA64_HP_ZX1 || IA64_GENERIC)
+       depends on AGP && (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC)

        help
          This option gives you AGP GART support for the HP ZX1 chipset
          for IA64 processors.
        help
          This option gives you AGP GART support for the HP ZX1 chipset
          for IA64 processors.