1 files changed, 12 insertions, 10 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 4c1546f71d56..661aa54dcb13 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -212,14 +212,6 @@ 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
@@ -1799,7 +1791,8 @@ config FB_AU1200
 config FB_VT8500
         bool "VT8500 LCD Driver"
         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
         help
           This is the framebuffer driver for VIA VT8500 integrated LCD
@@ -1808,12 +1801,21 @@ config FB_VT8500
 config FB_WM8505
         bool "WM8505 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
         help
           This is the framebuffer driver for WonderMedia WM8505/WM8650
           integrated LCD controller.
 
+config FB_WMT_GE_ROPS
+        bool "VT8500/WM85xx accelerated raster ops support"
+        depends on (FB = y) && (FB_VT8500 || FB_WM8505)
+        default n
+        help
+          This adds support for accelerated raster operations on the
+          VIA VT8500 and Wondermedia 85xx series SoCs.
+
 source "drivers/video/geode/Kconfig"
 
 config FB_HIT