From 61fb1e64b5374510bfaeb2137a5af5f6ea33ba34 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 6 Feb 2013 15:54:08 +0200 Subject: [PATCH 2/3] omap_vout: fix the dependency on OMAPDSS omap_vout uses "select" in Kconfig to enable omapdss. This doesn't work correctly, as "select" forces omapdss to be enabled in the config even if it normally could not be enabled. Instead of using select, this patch changes omap_vout to use "depend on". Signed-off-by: Tomi Valkeinen --- drivers/media/platform/omap/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/omap/Kconfig b/drivers/media/platform/omap/Kconfig index 390ab09..c102615 100644 --- a/drivers/media/platform/omap/Kconfig +++ b/drivers/media/platform/omap/Kconfig @@ -4,9 +4,9 @@ config VIDEO_OMAP2_VOUT_VRFB config VIDEO_OMAP2_VOUT tristate "OMAP2/OMAP3 V4L2-Display driver" depends on ARCH_OMAP2 || ARCH_OMAP3 + depends on OMAP2_DSS select VIDEOBUF_GEN select VIDEOBUF_DMA_CONTIG - select OMAP2_DSS select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3 select VIDEO_OMAP2_VOUT_VRFB if VIDEO_OMAP2_VOUT && OMAP2_VRFB default n -- 1.7.10.4