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


@@ -82,7 +83,7 @@ config AGP_INTEL
          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,
          E7205 and E7505 chipsets and full support for the 810, 815, 830M, 845G,
          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,
          E7205 and E7505 chipsets and full support for the 810, 815, 830M, 845G,

-         852GM, 855GM and 865G integrated graphics chipsets.
+         852GM, 855GM, 865G and I915 integrated graphics chipsets.

 
          You should say Y here if you use XFree86 3.3.6 or 4.x and want to
          use GLX or DRI, or if you have any Intel integrated graphics
 
          You should say Y here if you use XFree86 3.3.6 or 4.x and want to
          use GLX or DRI, or if you have any Intel integrated graphics


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


@@ -165,7 +166,7 @@ config AGP_EFFICEON
        tristate "Transmeta Efficeon support"
        depends on AGP && X86 && !X86_64
        help
        tristate "Transmeta Efficeon support"
        depends on AGP && X86 && !X86_64
        help

-         This option fives you AGP support for the Transmeta Efficeon
+         This option gives you AGP support for the Transmeta Efficeon

          series processors with integrated northbridges.
 
          You should say Y here if you use XFree86 3.3.6 or 4.x and want to
          series processors with integrated northbridges.
 
          You should say Y here if you use XFree86 3.3.6 or 4.x and want to