---

yaml --- r: 259557 b: refs/heads/master c: 8ded351 h: refs/heads/master i: 259555: 3105c76 v: v3
git-mirror · Jun 28, 2011 · ed553b7 · ed553b7
1 parent 4d414e7
commit ed553b7
Show file tree

Hide file tree

Showing 4 changed files with 185 additions and 335 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a1763320b8376caee8526823fc94ff612ca5358
+refs/heads/master: 8ded351ad1889e5351f29b3b1b1716c4992856ee
diff --git a/trunk/drivers/staging/dt3155v4l/Kconfig b/trunk/drivers/staging/dt3155v4l/Kconfig
@@ -1,7 +1,7 @@
 config VIDEO_DT3155
 	tristate "DT3155 frame grabber, Video4Linux interface"
 	depends on PCI && VIDEO_DEV && VIDEO_V4L2
-	select VIDEOBUF_DMA_CONTIG
+	select VIDEOBUF2_DMA_CONTIG
 	default n
 	---help---
 	  Enables dt3155 device driver for the DataTranslation DT3155 frame grabber.
@@ -18,3 +18,11 @@ config DT3155_CCIR
 	---help---
 	  Select it for CCIR/50Hz (European region),
 	  or leave it unselected for RS-170/60Hz (North America).
+
+config DT3155_STREAMING
+	bool "Selects streaming capture method"
+	depends on VIDEO_DT3155
+	default y
+	---help---
+	  Select it if you want to use streaming of memory mapped buffers
+	  or leave it unselected if you want to use read method (one copy more).