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 4d58fc5..ab23abe 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -38,9 +38,20 @@ config FB
          (e.g. an accelerated X server) and that are not frame buffer
          device-aware may cause unexpected results. If unsure, say N.
 
+config FB_MODE_HELPERS
+        bool "Enable Video Mode Handling Helpers"
+        depends on FB
+       default y
+       ---help---
+         This enables functions for handling video modes using the
+         Generalized Timing Formula and the EDID parser. A few drivers rely
+          on this feature such as the radeonfb, rivafb, and the i810fb. If
+         your driver does not take advantage of this feature, choosing Y will
+         just increase the kernel size by about 5K.
+
 config FB_CIRRUS
        tristate "Cirrus Logic support"
-       depends on FB && (AMIGA || PCI) && BROKEN
+       depends on FB && (ZORRO || PCI)
        ---help---
          This enables support for Cirrus Logic GD542x/543x based boards on
          Amiga: SD64, Piccolo, Picasso II/II+, Picasso IV, or EGS Spectrum.
@@ -68,6 +79,19 @@ config FB_PM2_FIFO_DISCONNECT
        help
          Support the Permedia2 FIFO disconnect feature (see CONFIG_FB_PM2).
 
+config FB_ARMCLCD
+       tristate "ARM PrimeCell PL110 support"
+       depends on FB && ARM && ARM_AMBA
+       help
+         This framebuffer device driver is for the ARM PrimeCell PL110
+         Colour LCD controller.  ARM PrimeCells provide the building
+         blocks for System on a Chip devices.
+
+         If you want to compile this as a module (=code which can be
+         inserted into and removed from the running kernel), say M
+         here and read <file:Documentation/modules.txt>.  The module
+         will be called amba-clcd.
+
 config FB_ACORN
        bool "Acorn VIDC support"
        depends on FB && ARM && ARCH_ACORN
@@ -93,7 +117,7 @@ config FB_SA1100
 
 config FB_CYBER2000
        tristate "CyberPro 2000/2010/5000 support"
-       depends on FB && PCI
+       depends on FB && PCI && (BROKEN || !SPARC64)
        help
          This enables support for the Integraphics CyberPro 20x0 and 5000
          VGA chips used in the Rebel.com Netwinder and other machines.
@@ -238,7 +262,7 @@ config FB_IMSTT
 
 config FB_S3TRIO
        bool "S3 Trio display support"
-       depends on FB && PPC
+       depends on FB && PPC && BROKEN
        help
          If you have a S3 Trio say Y. Say N for S3 Virge.
 
@@ -392,38 +416,21 @@ config FB_PVR2
          (<file:drivers/video/pvr2fb.c>). Please see the file
          <file:Documentation/fb/pvr2fb.txt>.
 
-config FB_E1355
+config FB_EPSON1355
        bool "Epson 1355 framebuffer support"
-       depends on FB && SUPERH
+       depends on FB && (SUPERH || ARCH_CEIVA)
        help
          Build in support for the SED1355 Epson Research Embedded RAMDAC
          LCD/CRT Controller (since redesignated as the S1D13505) as a
          framebuffer.  Product specs at
          <http://www.erd.epson.com/vdc/html/products.htm>.
 
-config E1355_REG_BASE
-       hex "Register Base Address"
-       depends on FB_E1355
-       default "a8000000"
-       help
-         Epson SED1355/S1D13505 LCD/CRT controller register base address.
-         See the manuals at
-         <http://www.erd.epson.com/vdc/html/contents/S1D13505.htm> for
-         discussion.
-
-config E1355_FB_BASE
-       hex "Framebuffer Base Address"
-       depends on FB_E1355
-       default "a8200000"
-       help
-         Epson SED1355/S1D13505 LCD/CRT controller memory base address.  See
-         the manuals at
-         <http://www.erd.epson.com/vdc/html/contents/S1D13505.htm> for
-         discussion.
-
 config FB_RIVA
        tristate "nVidia Riva support"
        depends on FB && PCI
+       select I2C_ALGOBIT if FB_RIVA_I2C
+       select I2C if FB_RIVA_I2C
+       select FB_MODE_HELPERS
        help
          This driver supports graphics boards with the nVidia Riva/Geforce
          chips.
@@ -432,9 +439,33 @@ config FB_RIVA
          To compile this driver as a module, choose M here: the
          module will be called rivafb.
 
+config FB_RIVA_I2C
+       bool "Enable DDC Support"
+       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_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        
+       depends on FB && EXPERIMENTAL && PCI && X86 && !X86_64
+       select AGP
+       select AGP_INTEL
+       select FB_MODE_HELPERS
        help
          This driver supports the on-board graphics built in to the Intel 810 
           and 815 chipsets.  Say Y if you have and plan to use such a board.
@@ -638,6 +669,7 @@ config FB_RADEON
        depends on FB && PCI
        select I2C_ALGOBIT if FB_RADEON_I2C
        select I2C if FB_RADEON_I2C
+       select FB_MODE_HELPERS
        help
          Choose this option if you want to use an ATI Radeon graphics card as
          a framebuffer device.  There are both PCI and AGP versions.  You
@@ -743,6 +775,7 @@ config FB_SIS_315
 config FB_NEOMAGIC
        tristate "NeoMagic display support"
        depends on FB && PCI
+       select FB_MODE_HELPERS
        help
          This driver supports notebooks with NeoMagic PCI chips.
          Say Y if you have such a graphics card.