Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

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

diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index 22f8cf218cc6443a1af9f523ae49dfc47fe56340..a9f9c48c2424c8f307061bdf7feda686d7a996ab 100644 (file)
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -1,6 +1,6 @@
 config AGP
        tristate "/dev/agpgart (AGP Support)"
 config AGP
        tristate "/dev/agpgart (AGP Support)"

-       depends on ALPHA || IA64 || PPC || X86
+       depends on ALPHA || IA64 || PARISC || PPC || X86

        depends on PCI
        ---help---
          AGP (Accelerated Graphics Port) is a bus system mainly used to
        depends on PCI
        ---help---
          AGP (Accelerated Graphics Port) is a bus system mainly used to


@@ -86,7 +86,7 @@ config AGP_NVIDIA
 
 config AGP_SIS
        tristate "SiS chipset support"
 
 config AGP_SIS
        tristate "SiS chipset support"

-       depends on AGP
+       depends on AGP && X86

        help
          This option gives you AGP support for the GLX component of
          X on Silicon Integrated Systems [SiS] chipsets.
        help
          This option gives you AGP support for the GLX component of
          X on Silicon Integrated Systems [SiS] chipsets.


@@ -103,7 +103,7 @@ config AGP_SWORKS
 
 config AGP_VIA
        tristate "VIA chipset support"
 
 config AGP_VIA
        tristate "VIA chipset support"

-       depends on AGP
+       depends on AGP && X86

        help
          This option gives you AGP support for the GLX component of
          X on VIA MVP3/Apollo Pro chipsets.
        help
          This option gives you AGP support for the GLX component of
          X on VIA MVP3/Apollo Pro chipsets.


@@ -122,6 +122,14 @@ config AGP_HP_ZX1
          This option gives you AGP GART support for the HP ZX1 chipset
          for IA64 processors.
 
          This option gives you AGP GART support for the HP ZX1 chipset
          for IA64 processors.
 

+config AGP_PARISC
+       tristate "HP Quicksilver AGP support"
+       depends on AGP && PARISC && 64BIT
+       help
+         This option gives you AGP GART support for the HP Quicksilver
+         AGP bus adapter on HP PA-RISC machines (Ok, just on the C8000
+         workstation...)
+

 config AGP_ALPHA_CORE
        tristate "Alpha AGP support"
        depends on AGP && (ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL)
 config AGP_ALPHA_CORE
        tristate "Alpha AGP support"
        depends on AGP && (ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL)