This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 798ba00..d80e806 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -40,7 +40,7 @@ config FB
 
 config FB_CIRRUS
        tristate "Cirrus Logic support"
-       depends on FB && (ZORRO || PCI)
+       depends on FB && (AMIGA || PCI)
        ---help---
          This enables support for Cirrus Logic GD542x/543x based boards on
          Amiga: SD64, Piccolo, Picasso II/II+, Picasso IV, or EGS Spectrum.
@@ -93,7 +93,7 @@ config FB_SA1100
 
 config FB_CYBER2000
        tristate "CyberPro 2000/2010/5000 support"
-       depends on FB && PCI && (BROKEN || !SPARC64)
+       depends on FB && PCI
        help
          This enables support for the Integraphics CyberPro 20x0 and 5000
          VGA chips used in the Rebel.com Netwinder and other machines.
@@ -238,7 +238,7 @@ config FB_IMSTT
 
 config FB_S3TRIO
        bool "S3 Trio display support"
-       depends on FB && PPC && BROKEN
+       depends on FB && PPC
        help
          If you have a S3 Trio say Y. Say N for S3 Virge.
 
@@ -446,15 +446,6 @@ config FB_RIVA_I2C
          independently validate video mode parameters, you should say Y
          here.
 
-config FB_RIVA_DEBUG
-       bool "Lots of debug output from Riva(nVidia) driver"
-       depends on FB_RIVA
-       default n
-       help
-         Say Y here if you want the Riva driver to output all sorts
-         of debugging informations to provide to the maintainer when
-         something goes wrong.
-
 config FB_I810
        tristate "Intel 810/815 support (EXPERIMENTAL)"
        depends on FB && AGP && AGP_INTEL && EXPERIMENTAL && PCI