summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-04-09 15:51:18 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-04-09 15:51:18 -0300
commit05eaeb82005a71ead3bf3b0a207f55f9f178c131 (patch)
tree1e2f70230291b5e688af0525fd81ff2b845cb216 /linux/drivers/media/video
parent47d9ea56db3d35c645477ed1540e852886230d74 (diff)
downloadmediapointer-dvb-s2-05eaeb82005a71ead3bf3b0a207f55f9f178c131.tar.gz
mediapointer-dvb-s2-05eaeb82005a71ead3bf3b0a207f55f9f178c131.tar.bz2
Add VIVI Kconfig stuff
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/Kconfig11
-rw-r--r--linux/drivers/media/video/Makefile2
2 files changed, 13 insertions, 0 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig
index 9cc7d07a0..e4dd4181d 100644
--- a/linux/drivers/media/video/Kconfig
+++ b/linux/drivers/media/video/Kconfig
@@ -16,6 +16,17 @@ config VIDEO_ADV_DEBUG
V4L devices.
In doubt, say N.
+config VIDEO_VIVI
+ tristate "Virtual Video Driver"
+ depends on VIDEO_V4L2
+ default n
+ ---help---
+ Enables a virtual video driver. This device shows a color bar
+ and a timestamp, as a real device would generate by using V4L2
+ api.
+ Say Y here if you want to test video apps or debug V4L devices.
+ In doubt, say N.
+
source "drivers/media/video/bt8xx/Kconfig"
config VIDEO_SAA6588
diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile
index 5284ad126..d61bc458f 100644
--- a/linux/drivers/media/video/Makefile
+++ b/linux/drivers/media/video/Makefile
@@ -86,4 +86,6 @@ obj-$(CONFIG_USB_IBMCAM) += usbvideo/
obj-$(CONFIG_USB_KONICAWC) += usbvideo/
obj-$(CONFIG_USB_VICAM) += usbvideo/
+obj-$(CONFIG_VIDEO_VIVI) += vivi.o
+
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core