aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrabhakar Lad <prabhakar.csengg@gmail.com>2014-08-16 16:33:18 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-09-21 19:17:22 -0400
commit7000e325de875fa8a5dd3885c8e8f0f12cf71eaf (patch)
treed4a2e2a1726987ca2e080fc5ab803f4854c8b155
parentc54d4a0b08bc4deddd3919d64f4121eaa487e28e (diff)
[media] media: davinci: remove unneeded dependency ARCH_OMAP3
this patch removes unneeded dependency of ARCH_OMAP3 on VIDEO_DM6446_CCDC. Also the top level platform Makefile descended into davinci/ without any dependency so just drop the dependency obj-y, as obj-$(CONFIG_ARCH_DAVINCI) already exists. Reported-by: Andreas Ruprecht <rupran@einserver.de> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/platform/Makefile2
-rw-r--r--drivers/media/platform/davinci/Kconfig2
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 8d3fcfef099c..579046bc276f 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -47,8 +47,6 @@ obj-$(CONFIG_SOC_CAMERA) += soc_camera/
47 47
48obj-$(CONFIG_VIDEO_RENESAS_VSP1) += vsp1/ 48obj-$(CONFIG_VIDEO_RENESAS_VSP1) += vsp1/
49 49
50obj-y += davinci/
51
52obj-y += omap/ 50obj-y += omap/
53 51
54ccflags-y += -I$(srctree)/drivers/media/i2c 52ccflags-y += -I$(srctree)/drivers/media/i2c
diff --git a/drivers/media/platform/davinci/Kconfig b/drivers/media/platform/davinci/Kconfig
index b04016e8532d..d9e1ddb586b1 100644
--- a/drivers/media/platform/davinci/Kconfig
+++ b/drivers/media/platform/davinci/Kconfig
@@ -31,7 +31,7 @@ config VIDEO_DAVINCI_VPIF_CAPTURE
31config VIDEO_DM6446_CCDC 31config VIDEO_DM6446_CCDC
32 tristate "TI DM6446 CCDC video capture driver" 32 tristate "TI DM6446 CCDC video capture driver"
33 depends on VIDEO_V4L2 33 depends on VIDEO_V4L2
34 depends on ARCH_DAVINCI || ARCH_OMAP3 || COMPILE_TEST 34 depends on ARCH_DAVINCI || COMPILE_TEST
35 depends on HAS_DMA 35 depends on HAS_DMA
36 select VIDEOBUF_DMA_CONTIG 36 select VIDEOBUF_DMA_CONTIG
37 help 37 help