summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/Kconfig11
-rw-r--r--linux/drivers/media/video/Makefile2
-rw-r--r--v4l/versions.txt1
3 files changed, 14 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
diff --git a/v4l/versions.txt b/v4l/versions.txt
index ecaa7dd7e..ffdbaae76 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -64,6 +64,7 @@ RADIO_ZOLTRIX
RADIO_ZOLTRIX_PORT
[2.6.12]
+VIDEO_VIVI
VIDEO_DEV
VIDEO_V4L1
VIDEO_V4L2