Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-beck.git] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index bfc62d1ee2f7a505d9d98a5056fc6990ae2b56d1..e6a8d8c0101d6185a9adc1645e45e3d7feca7c81 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2321,6 +2321,15 @@ config FB_JZ4740
        help
          Framebuffer support for the JZ4740 SoC.
 
+config FB_MXS
+       tristate "MXS LCD framebuffer support"
+       depends on FB && ARCH_MXS
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       help
+         Framebuffer support for the MXS SoC.
+
 config FB_PUV3_UNIGFX
        tristate "PKUnity v3 Unigfx framebuffer support"
        depends on FB && UNICORE32 && ARCH_PUV3