diff options
author | Muralidharan Karicheri <m-karicheri2@ti.com> | 2009-09-16 13:31:02 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 23:19:37 -0400 |
commit | 89803d83b69c5ce05c590f01a0ba92b99d28b057 (patch) | |
tree | 7058f00c4df814aadb76a9f0da3f7d2abe295f74 /drivers | |
parent | 317b2e2f4b5d2b69d9bd49e4fed386d176344e76 (diff) |
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/Kconfig | 15 | ||||
-rw-r--r-- | drivers/media/video/davinci/Makefile | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 9b8f79afe190..dc71eaea6af8 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -501,10 +501,21 @@ config DISPLAY_DAVINCI_DM646X_EVM | |||
501 | select VIDEO_ADV7343 | 501 | select VIDEO_ADV7343 |
502 | select VIDEO_THS7303 | 502 | select VIDEO_THS7303 |
503 | help | 503 | help |
504 | Support for DaVinci based display device. | 504 | Support for DM6467 based display device. |
505 | 505 | ||
506 | To compile this driver as a module, choose M here: the | 506 | To compile this driver as a module, choose M here: the |
507 | module will be called davincihd_display. | 507 | module will be called vpif_display. |
508 | |||
509 | config CAPTURE_DAVINCI_DM646X_EVM | ||
510 | tristate "DM646x EVM Video Capture" | ||
511 | depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM | ||
512 | select VIDEOBUF_DMA_CONTIG | ||
513 | select VIDEO_DAVINCI_VPIF | ||
514 | help | ||
515 | Support for DM6467 based capture device. | ||
516 | |||
517 | To compile this driver as a module, choose M here: the | ||
518 | module will be called vpif_capture. | ||
508 | 519 | ||
509 | config VIDEO_DAVINCI_VPIF | 520 | config VIDEO_DAVINCI_VPIF |
510 | tristate "DaVinci VPIF Driver" | 521 | tristate "DaVinci VPIF Driver" |
diff --git a/drivers/media/video/davinci/Makefile b/drivers/media/video/davinci/Makefile index f44cad2f5412..1a8b8f3f182e 100644 --- a/drivers/media/video/davinci/Makefile +++ b/drivers/media/video/davinci/Makefile | |||
@@ -7,6 +7,8 @@ obj-$(CONFIG_VIDEO_DAVINCI_VPIF) += vpif.o | |||
7 | 7 | ||
8 | #DM646x EVM Display driver | 8 | #DM646x EVM Display driver |
9 | obj-$(CONFIG_DISPLAY_DAVINCI_DM646X_EVM) += vpif_display.o | 9 | obj-$(CONFIG_DISPLAY_DAVINCI_DM646X_EVM) += vpif_display.o |
10 | #DM646x EVM Capture driver | ||
11 | obj-$(CONFIG_CAPTURE_DAVINCI_DM646X_EVM) += vpif_capture.o | ||
10 | 12 | ||
11 | # Capture: DM6446 and DM355 | 13 | # Capture: DM6446 and DM355 |
12 | obj-$(CONFIG_VIDEO_VPSS_SYSTEM) += vpss.o | 14 | obj-$(CONFIG_VIDEO_VPSS_SYSTEM) += vpss.o |