---

yaml --- r: 65919 b: refs/heads/master c: 87b9ad0 h: refs/heads/master i: 65917: be8ebe6 65915: c5ad3e3 65911: 1d6a141 65903: 400b4a6 65887: 52c0c52 65855: cb5f36c 65791: c7fb569 v: v3
git-mirror · Oct 10, 2007 · 03f4bdc · 03f4bdc
1 parent 7578c0b
commit 03f4bdc
Show file tree

Hide file tree

Showing 6 changed files with 435 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bb2790f8a0cf93d3dbed6b6e986441110e6174b
+refs/heads/master: 87b9ad070cf76c0f1e8cf836f7eb86e9ac94e34a
diff --git a/trunk/drivers/media/Kconfig b/trunk/drivers/media/Kconfig
@@ -134,6 +134,10 @@ config VIDEOBUF_DMA_SG
 	select VIDEOBUF_GEN
 	tristate
 
+config VIDEOBUF_VMALLOC
+	select VIDEOBUF_GEN
+	tristate
+
 config VIDEO_BUF_DVB
 	tristate
 

diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig
@@ -364,7 +364,7 @@ endmenu # encoder / decoder chips
 config VIDEO_VIVI
 	tristate "Virtual Video Driver"
 	depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 && PCI
-	select VIDEOBUF_DMA_SG
+	select VIDEOBUF_VMALLOC
 	default n
 	---help---
 	  Enables a virtual video driver. This device shows a color bar

diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile
@@ -89,6 +89,7 @@ obj-$(CONFIG_TUNER_TEA5761) += tea5761.o
 
 obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
 obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
+obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o
 obj-$(CONFIG_VIDEO_BUF_DVB) += video-buf-dvb.o
 obj-$(CONFIG_VIDEO_BTCX)  += btcx-risc.o
 obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o