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

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 34c3d96..84b685f 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2100,13 +2100,6 @@ config GPM1040A0_320X240
         bool "Giantplus Technology GPM1040A0 320x240 Color TFT LCD"
         depends on FB_NUC900
 
-config FB_NUC900_DEBUG
-        bool "NUC900 lcd debug messages"
-        depends on FB_NUC900
-        help
-          Turn on debugging messages. Note that you can set/unset at run time
-          through sysfs
-
 config FB_SM501
        tristate "Silicon Motion SM501 framebuffer support"
        depends on FB && MFD_SM501
@@ -2228,15 +2221,17 @@ config FB_SH7760
          panels <= 320 pixel horizontal resolution.
 
 config FB_DA8XX
-       tristate "DA8xx/OMAP-L1xx Framebuffer support"
-       depends on FB && ARCH_DAVINCI_DA8XX
+       tristate "DA8xx/OMAP-L1xx/AM335x Framebuffer support"
+       depends on FB && (ARCH_DAVINCI_DA8XX || SOC_AM33XX)
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        select FB_CFB_REV_PIXELS_IN_BYTE
+       select FB_MODE_HELPERS
+       select VIDEOMODE_HELPERS
        ---help---
          This is the frame buffer device driver for the TI LCD controller
-         found on DA8xx/OMAP-L1xx SoCs.
+         found on DA8xx/OMAP-L1xx/AM335x SoCs.
          If unsure, say N.
 
 config FB_VIRTUAL