fbdev: Merge fbdev topic branches

Merge branches '3.10/auo-k190x', '3.10/misc', '3.10/videomode' and '3.10/vt8500' into for-next

diff --combined drivers/video/Kconfig
index 4c1546f71d56a2be51785f3bf02ab50437ac94d6,4c1546f71d56a2be51785f3bf02ab50437ac94d6,2a81b11367fe3f915fb0bcaeaa2da5d4990e6ab9,d0c932a86115c27f48164e21e93177ca57581f29..714d32a279e25211801c595df484a883f9ab85c6
--- 1/drivers/video/Kconfig
--- 2/drivers/video/Kconfig
--- 3/drivers/video/Kconfig
--- 4/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@@@@ -31,26 -31,26 -31,8 -31,26 +31,8 @@@@@ config VIDEO_OUTPUT_CONTRO
          This framework adds support for low-level control of the video 
          output switch.
    
-- -config DISPLAY_TIMING
-- -       bool
-- -
-- -config VIDEOMODE
-- -       bool
-- -
-- -config OF_DISPLAY_TIMING
-- -    bool "Enable device tree display timing support"
-- -    depends on OF
-- -    select DISPLAY_TIMING
-- -    help
-- -      helper to parse display timings from the devicetree
-- -
-- -config OF_VIDEOMODE
-- -    bool "Enable device tree videomode support"
-- -    depends on OF
-- -    select VIDEOMODE
-- -    select OF_DISPLAY_TIMING
-- -    help
-- -      helper to get videomodes from the devicetree
++ +config VIDEOMODE_HELPERS
++ +    bool
    
    config HDMI
        bool
@@@@@ -212,14 -212,14 -194,14 -212,6 +194,6 @@@@@ config FB_SYS_FOP
           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
@@@@@ -1797,22 -1797,22 -1779,22 -1789,39 +1771,39 @@@@@ config FB_AU120
          option au1200fb:panel=<name>.
    
    config FB_VT8500
---     bool "VT8500 LCD Driver"
+++     bool "VIA VT8500 framebuffer support"
        depends on (FB = y) && ARM && ARCH_VT8500
---     select FB_WMT_GE_ROPS
+++     select FB_SYS_FILLRECT if (!FB_WMT_GE_ROPS)
+++     select FB_SYS_COPYAREA if (!FB_WMT_GE_ROPS)
        select FB_SYS_IMAGEBLIT
+++     select FB_MODE_HELPERS
+++     select OF_DISPLAY_TIMING
+++     select OF_VIDEOMODE
        help
          This is the framebuffer driver for VIA VT8500 integrated LCD
          controller.
    
    config FB_WM8505
---     bool "WM8505 frame buffer support"
+++     bool "Wondermedia WM8xxx-series frame buffer support"
        depends on (FB = y) && ARM && ARCH_VT8500
---     select FB_WMT_GE_ROPS
+++     select FB_SYS_FILLRECT if (!FB_WMT_GE_ROPS)
+++     select FB_SYS_COPYAREA if (!FB_WMT_GE_ROPS)
        select FB_SYS_IMAGEBLIT
+++     select FB_MODE_HELPERS
+++     select OF_DISPLAY_TIMING
+++     select OF_VIDEOMODE
+++     help
+++       This is the framebuffer driver for WonderMedia WM8xxx-series
+++       integrated LCD controller. This driver covers the WM8505, WM8650
+++       and WM8850 SoCs.
+++ 
+++ config FB_WMT_GE_ROPS
+++     bool "VT8500/WM8xxx accelerated raster ops support"
+++     depends on (FB = y) && (FB_VT8500 || FB_WM8505)
+++     default n
        help
---       This is the framebuffer driver for WonderMedia WM8505/WM8650
---       integrated LCD controller.
+++       This adds support for accelerated raster operations on the
+++       VIA VT8500 and Wondermedia 85xx series SoCs.
    
    source "drivers/video/geode/Kconfig"