Merge branch 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelf...

[sfrench/cifs-2.6.git] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index fdebd60a3250a68213f68a41ee451693351d2af1..5641498725d0c5ed739fd6da5d99f0d1fe6393cc 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -70,6 +70,22 @@ config FB_MACMODES
        depends on FB
        default n
 
+config FB_FIRMWARE_EDID
+       bool "Enable firmware EDID"
+       depends on FB
+       default y
+       ---help---
+         This enables access to the EDID transferred from the firmware.
+        On the i386, this is from the Video BIOS. Enable this if DDC/I2C
+        transfers do not work for your driver and if you are using
+        nvidiafb, i810fb or savagefb.
+
+        In general, choosing Y for this option is safe.  If you
+        experience extremely long delays while booting before you get
+        something on your display, try setting this to N.  Matrox cards in
+        combination with certain motherboards and monitors are known to
+        suffer from this problem.
+
 config FB_MODE_HELPERS
         bool "Enable Video Mode Handling Helpers"
         depends on FB
@@ -384,6 +400,8 @@ config FB_ASILIANT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
+       help
+         This is the frame buffer device driver for the Asiliant 69030 chipset
 
 config FB_IMSTT
        bool "IMS Twin Turbo display support"
@@ -725,7 +743,7 @@ config FB_I810_I2C
 
 config FB_INTEL
        tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)"
-       depends on FB && EXPERIMENTAL && PCI && X86_32
+       depends on FB && EXPERIMENTAL && PCI && X86
        select AGP
        select AGP_INTEL
        select FB_MODE_HELPERS
@@ -888,18 +906,6 @@ config FB_MATROX_MULTIHEAD
          There is no need for enabling 'Matrox multihead support' if you have
          only one Matrox card in the box.
 
-config FB_RADEON_OLD
-       tristate "ATI Radeon display support (Old driver)"
-       depends on FB && PCI
-       select FB_CFB_FILLRECT
-       select FB_CFB_COPYAREA
-       select FB_CFB_IMAGEBLIT
-       select FB_MACMODES if PPC
-       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
-         don't need to choose this to run the Radeon in plain VGA mode.
-
 config FB_RADEON
        tristate "ATI Radeon display support"
        depends on FB && PCI
@@ -957,7 +963,7 @@ config FB_ATY128
 
 config FB_ATY
        tristate "ATI Mach64 display support" if PCI || ATARI
-       depends on FB
+       depends on FB && !SPARC32
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -1202,6 +1208,17 @@ config FB_AU1100
        bool "Au1100 LCD Driver"
        depends on (FB = y) && EXPERIMENTAL && PCI && MIPS && MIPS_PB1100=y
 
+config FB_AU1200
+       bool "Au1200 LCD Driver"
+       depends on FB && MIPS && SOC_AU1200
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       help
+         This is the framebuffer driver for the AMD Au1200 SOC.  It can drive
+         various panels and CRTs by passing in kernel cmd line option
+         au1200fb:panel=<name>.
+
 source "drivers/video/geode/Kconfig"
 
 config FB_FFB