Merge to Fedora kernel-2.6.7-1.492

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

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7c551a2..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 && (AMIGA || PCI) && BROKEN
+       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.
@@ -424,6 +424,8 @@ config E1355_FB_BASE
 config FB_RIVA
        tristate "nVidia Riva support"
        depends on FB && PCI
+       select I2C_ALGOBIT if FB_RIVA_I2C
+       select I2C if FB_RIVA_I2C
        help
          This driver supports graphics boards with the nVidia Riva/Geforce
          chips.
@@ -434,8 +436,15 @@ config FB_RIVA
 
 config FB_RIVA_I2C
        bool "Enable DDC Support"
-       depends on FB_RIVA && I2C
+       depends on FB_RIVA
        help
+         This enables I2C support for nVidia Chipsets.  This is used
+         only for getting EDID information from the attached display
+         allowing for robust video mode handling and switching.
+
+         Because fbdev-2.6 requires that drivers must be able to
+         independently validate video mode parameters, you should say Y
+         here.
 
 config FB_I810
        tristate "Intel 810/815 support (EXPERIMENTAL)"