aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-04-09 14:51:18 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-05-12 18:54:54 -0400
commitc1d1ea9e0f83a89d7afa1c84fac8312e2e08c85e (patch)
tree3a6bae707222eb1ee8f52fe2f23847da25995c1e /drivers/media
parentcd41e28e2d0f198ad56840bf8ba13cb41b129bab (diff)
V4L/DVB (3775): Add VIVI Kconfig stuff
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/Kconfig11
-rw-r--r--drivers/media/video/Makefile2
2 files changed, 13 insertions, 0 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index bff9d8f51dab..0dce9ab03ada 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -16,6 +16,17 @@ config VIDEO_ADV_DEBUG
16 V4L devices. 16 V4L devices.
17 In doubt, say N. 17 In doubt, say N.
18 18
19config VIDEO_VIVI
20 tristate "Virtual Video Driver"
21 depends on VIDEO_V4L2
22 default n
23 ---help---
24 Enables a virtual video driver. This device shows a color bar
25 and a timestamp, as a real device would generate by using V4L2
26 api.
27 Say Y here if you want to test video apps or debug V4L devices.
28 In doubt, say N.
29
19source "drivers/media/video/bt8xx/Kconfig" 30source "drivers/media/video/bt8xx/Kconfig"
20 31
21config VIDEO_SAA6588 32config VIDEO_SAA6588
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 11b06dac347b..18b844219c1f 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -85,4 +85,6 @@ obj-$(CONFIG_USB_IBMCAM) += usbvideo/
85obj-$(CONFIG_USB_KONICAWC) += usbvideo/ 85obj-$(CONFIG_USB_KONICAWC) += usbvideo/
86obj-$(CONFIG_USB_VICAM) += usbvideo/ 86obj-$(CONFIG_USB_VICAM) += usbvideo/
87 87
88obj-$(CONFIG_VIDEO_VIVI) += vivi.o
89
88EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 90EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core