Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

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

diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index a4d425d..46685a5 100644 (file)
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -1,7 +1,6 @@
 config AGP
-       tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU
+       tristate "/dev/agpgart (AGP Support)"
        depends on ALPHA || IA64 || PPC || X86
-       default y if GART_IOMMU
        ---help---
          AGP (Accelerated Graphics Port) is a bus system mainly used to
          connect graphics cards to the rest of the system.
@@ -86,7 +85,7 @@ config AGP_NVIDIA
 
 config AGP_SIS
        tristate "SiS chipset support"
-       depends on AGP && X86_32
+       depends on AGP
        help
          This option gives you AGP support for the GLX component of
          X on Silicon Integrated Systems [SiS] chipsets.
@@ -98,12 +97,12 @@ config AGP_SWORKS
        tristate "Serverworks LE/HE chipset support"
        depends on AGP && X86_32
        help
-         Say Y here to support the Serverworks AGP card.  See 
+         Say Y here to support the Serverworks AGP card.  See
          <http://www.serverworks.com/> for product descriptions and images.
 
 config AGP_VIA
        tristate "VIA chipset support"
-       depends on AGP && X86_32
+       depends on AGP
        help
          This option gives you AGP support for the GLX component of
          X on VIA MVP3/Apollo Pro chipsets.