summaryrefslogtreecommitdiff
path: root/drivers/video/Kconfig
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2013-08-29 16:40:14 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-08-29 16:40:14 +0300
commit53bd1a4283798dfa392442cf28b6ee94b54e3284 (patch)
tree37a315a75881127dcc0737986173f33e2d352baa /drivers/video/Kconfig
parentfd3cd7ee126b2c3768d5253e12ac51868b0652f1 (diff)
parent979778ffdbb5686c78f9045947e5f870c496fd0f (diff)
downloadlwn-53bd1a4283798dfa392442cf28b6ee94b54e3284.tar.gz
lwn-53bd1a4283798dfa392442cf28b6ee94b54e3284.zip
Merge branch '3.12/da8xx' into 3.12/fbdev
Merge da8xx-fb improvements from Darren Etheridge.
Diffstat (limited to 'drivers/video/Kconfig')
-rw-r--r--drivers/video/Kconfig8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index a421fd432bfc..b49f5b55f708 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2221,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