summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMuralidharan Karicheri <m-karicheri2@ti.com>2009-09-16 14:31:02 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-19 00:19:37 -0300
commit89803d83b69c5ce05c590f01a0ba92b99d28b057 (patch)
tree7058f00c4df814aadb76a9f0da3f7d2abe295f74 /drivers
parent317b2e2f4b5d2b69d9bd49e4fed386d176344e76 (diff)
downloadop-kernel-dev-89803d83b69c5ce05c590f01a0ba92b99d28b057.zip
op-kernel-dev-89803d83b69c5ce05c590f01a0ba92b99d28b057.tar.gz
V4L/DVB (12906b): V4L : vpif capture - Kconfig and Makefile changes
Adds Kconfig and Makefile changes required for vpif capture driver Resending to merge to V4L linux-next Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Muralidharan Karicheri <m-karicheri2@ti.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/Kconfig15
-rw-r--r--drivers/media/video/davinci/Makefile2
2 files changed, 15 insertions, 2 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 9b8f79a..dc71eae 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -501,10 +501,21 @@ config DISPLAY_DAVINCI_DM646X_EVM
select VIDEO_ADV7343
select VIDEO_THS7303
help
- Support for DaVinci based display device.
+ Support for DM6467 based display device.
To compile this driver as a module, choose M here: the
- module will be called davincihd_display.
+ module will be called vpif_display.
+
+config CAPTURE_DAVINCI_DM646X_EVM
+ tristate "DM646x EVM Video Capture"
+ depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM
+ select VIDEOBUF_DMA_CONTIG
+ select VIDEO_DAVINCI_VPIF
+ help
+ Support for DM6467 based capture device.
+
+ To compile this driver as a module, choose M here: the
+ module will be called vpif_capture.
config VIDEO_DAVINCI_VPIF
tristate "DaVinci VPIF Driver"
diff --git a/drivers/media/video/davinci/Makefile b/drivers/media/video/davinci/Makefile
index f44cad2..1a8b8f3 100644
--- a/drivers/media/video/davinci/Makefile
+++ b/drivers/media/video/davinci/Makefile
@@ -7,6 +7,8 @@ obj-$(CONFIG_VIDEO_DAVINCI_VPIF) += vpif.o
#DM646x EVM Display driver
obj-$(CONFIG_DISPLAY_DAVINCI_DM646X_EVM) += vpif_display.o
+#DM646x EVM Capture driver
+obj-$(CONFIG_CAPTURE_DAVINCI_DM646X_EVM) += vpif_capture.o
# Capture: DM6446 and DM355
obj-$(CONFIG_VIDEO_VPSS_SYSTEM) += vpss.o
OpenPOWER on IntegriCloud