Merge branch 'fbdev/udlfb'

[pandora-kernel.git] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 37771d0..9f36a29 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -186,6 +186,14 @@ config FB_SYS_FOPS
        depends on FB
        default n
 
+config FB_WMT_GE_ROPS
+       tristate
+       depends on FB
+       default n
+       ---help---
+         Include functions for accelerated rectangle filling and area
+         copying using WonderMedia Graphics Engine operations.
+
 config FB_DEFERRED_IO
        bool
        depends on FB
@@ -635,6 +643,72 @@ config FB_BFIN_LQ035Q1
          To compile this driver as a module, choose M here: the
          module will be called bfin-lq035q1-fb.
 
+config FB_BF537_LQ035
+       tristate "SHARP LQ035 TFT LCD (BF537 STAMP)"
+       depends on FB && (BF534 || BF536 || BF537) && I2C_BLACKFIN_TWI
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       select BFIN_GPTIMERS
+       help
+         This is the framebuffer device for a SHARP LQ035Q7DB03 TFT LCD
+         attached to a BF537.
+
+         To compile this driver as a module, choose M here: the
+         module will be called bf537-lq035.
+
+config FB_BFIN_7393
+       tristate "Blackfin ADV7393 Video encoder"
+       depends on FB && BLACKFIN
+       select I2C
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       help
+         This is the framebuffer device for a ADV7393 video encoder
+         attached to a Blackfin on the PPI port.
+         If your Blackfin board has a ADV7393 select Y.
+
+         To compile this driver as a module, choose M here: the
+         module will be called bfin_adv7393fb.
+
+choice
+       prompt  "Video mode support"
+       depends on FB_BFIN_7393
+       default NTSC
+
+config NTSC
+       bool 'NTSC 720x480'
+
+config PAL
+       bool 'PAL 720x576'
+
+config NTSC_640x480
+       bool 'NTSC 640x480 (Experimental)'
+
+config PAL_640x480
+       bool 'PAL 640x480 (Experimental)'
+
+config NTSC_YCBCR
+       bool 'NTSC 720x480 YCbCR input'
+
+config PAL_YCBCR
+       bool 'PAL 720x576 YCbCR input'
+
+endchoice
+
+choice
+       prompt  "Size of ADV7393 frame buffer memory Single/Double Size"
+       depends on (FB_BFIN_7393)
+       default ADV7393_1XMEM
+
+config ADV7393_1XMEM
+       bool 'Single'
+
+config ADV7393_2XMEM
+       bool 'Double'
+endchoice
+
 config FB_STI
        tristate "HP STI frame buffer device support"
        depends on FB && PARISC
@@ -750,24 +824,14 @@ config FB_N411
 config FB_HGA
        tristate "Hercules mono graphics support"
        depends on FB && X86
-       select FB_CFB_FILLRECT
-       select FB_CFB_COPYAREA
-       select FB_CFB_IMAGEBLIT
        help
          Say Y here if you have a Hercules mono graphics card.
 
          To compile this driver as a module, choose M here: the
          module will be called hgafb.
 
-         As this card technology is 15 years old, most people will answer N
-         here.
-
-config FB_HGA_ACCEL
-       bool "Hercules mono Acceleration functions (EXPERIMENTAL)"
-       depends on FB_HGA && EXPERIMENTAL
-       ---help---
-       This will compile the Hercules mono graphics with
-       acceleration functions.
+         As this card technology is at least 25 years old,
+         most people will answer N here.
 
 config FB_SGIVW
        tristate "SGI Visual Workstation framebuffer support"
@@ -1722,6 +1786,24 @@ config FB_AU1200
          various panels and CRTs by passing in kernel cmd line option
          au1200fb:panel=<name>.
 
+config FB_VT8500
+       bool "VT8500 LCD Driver"
+       depends on (FB = y) && ARM && ARCH_VT8500 && VTWM_VERSION_VT8500
+       select FB_WMT_GE_ROPS
+       select FB_SYS_IMAGEBLIT
+       help
+         This is the framebuffer driver for VIA VT8500 integrated LCD
+         controller.
+
+config FB_WM8505
+       bool "WM8505 frame buffer support"
+       depends on (FB = y) && ARM && ARCH_VT8500 && VTWM_VERSION_WM8505
+       select FB_WMT_GE_ROPS
+       select FB_SYS_IMAGEBLIT
+       help
+         This is the framebuffer driver for WonderMedia WM8505
+         integrated LCD controller.
+
 source "drivers/video/geode/Kconfig"
 
 config FB_HIT