summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/Kconfig
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-16 16:44:11 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-16 16:44:11 -0300
commitc7b38fa86c8174233108c89a0f13243486eeced4 (patch)
tree29a2f342ffb4b0835325c0621f7d6d93d51d65a0 /linux/drivers/media/video/Kconfig
parente3255aa9a39e6d17b11bdc91e55782c9a7d940dc (diff)
downloadmediapointer-dvb-s2-c7b38fa86c8174233108c89a0f13243486eeced4.tar.gz
mediapointer-dvb-s2-c7b38fa86c8174233108c89a0f13243486eeced4.tar.bz2
backport git changes on DaVinci driver
From: Mauro Carvalho Chehab <mchehab@redhat.com> Due to several conflicts with OMAP arch files, the DaVinci patches were applied directly to the -git tree. So, we need to backport those changes to -hg. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/Kconfig')
-rw-r--r--linux/drivers/media/video/Kconfig15
1 files changed, 13 insertions, 2 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig
index 14a1b6160..298eb937e 100644
--- a/linux/drivers/media/video/Kconfig
+++ b/linux/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"