Merge tag 'fbdev-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

[mirror_ubuntu-artful-kernel.git] / drivers / video / fbdev / Kconfig

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index e05a58d759bee709fb13d68089abeb7e0f1add38..e911b9c96e19ba644226b5ef5bb96338915c0995 100644 (file)
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -280,6 +280,8 @@ config FB_ARMCLCD
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
+       select FB_MODE_HELPERS if OF
+       select VIDEOMODE_HELPERS if OF
        help
          This framebuffer device driver is for the ARM PrimeCell PL110
          Colour LCD controller.  ARM PrimeCells provide the building
@@ -307,15 +309,26 @@ config FB_ACORN
          hardware found in Acorn RISC PCs and other ARM-based machines.  If
          unsure, say N.
 
-config FB_CLPS711X
-       bool "CLPS711X LCD support"
-       depends on (FB = y) && ARM && ARCH_CLPS711X
+config FB_CLPS711X_OLD
+       tristate
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
+
+config FB_CLPS711X
+       tristate "CLPS711X LCD support"
+       depends on FB && (ARCH_CLPS711X || COMPILE_TEST)
+       select FB_CLPS711X_OLD if ARCH_CLPS711X && !ARCH_MULTIPLATFORM
+       select BACKLIGHT_LCD_SUPPORT
+       select FB_MODE_HELPERS
+       select FB_SYS_FILLRECT
+       select FB_SYS_COPYAREA
+       select FB_SYS_IMAGEBLIT
+       select LCD_CLASS_DEVICE
+       select VIDEOMODE_HELPERS
        help
-         Say Y to enable the Framebuffer driver for the CLPS7111 and
-         EP7212 processors.
+         Say Y to enable the Framebuffer driver for the Cirrus Logic
+         CLPS711X CPUs.
 
 config FB_SA1100
        bool "SA-1100 LCD support"