summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2015-12-09 18:32:27 +0100
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-12-29 10:07:47 +0100
commitf3dab1e317ad9f22d8062382447a37febe5858d2 (patch)
treeb60eeca4907d1996d1b92ab9581e6a9a3db9befe /drivers/media
parentomapfb/displays: change CONFIG_DISPLAY_* to CONFIG_FB_OMAP2_* (diff)
downloadlinux-f3dab1e317ad9f22d8062382447a37febe5858d2.tar.xz
linux-f3dab1e317ad9f22d8062382447a37febe5858d2.zip
omapfb: take omapfb's private omapdss into use
omapfb's private copy of omapdss is now ready to be used. This patch makes omapfb use its private omapdss and display drivers, and also makes omap_vout (which uses omapfb) to depend on omapfb. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Acked-by: Dave Airlie <airlied@gmail.com> Acked-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/omap/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/omap/Kconfig b/drivers/media/platform/omap/Kconfig
index 217d613b0fe7..e8e2db181a7a 100644
--- a/drivers/media/platform/omap/Kconfig
+++ b/drivers/media/platform/omap/Kconfig
@@ -5,9 +5,9 @@ config VIDEO_OMAP2_VOUT
tristate "OMAP2/OMAP3 V4L2-Display driver"
depends on MMU
depends on ARCH_OMAP2 || ARCH_OMAP3
+ depends on FB_OMAP2
select VIDEOBUF_GEN
select VIDEOBUF_DMA_CONTIG
- select OMAP2_DSS if HAS_IOMEM && ARCH_OMAP2PLUS
select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3
select VIDEO_OMAP2_VOUT_VRFB if VIDEO_OMAP2_VOUT && OMAP2_VRFB
select FRAME_VECTOR