---

yaml --- r: 320614 b: refs/heads/master c: 2401dd2 h: refs/heads/master v: v3
git-mirror · Jul 30, 2012 · 5ed5499 · 5ed5499
1 parent b901cc0
commit 5ed5499
Show file tree

Hide file tree

Showing 4 changed files with 285 additions and 315 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60aa38d87d7d50a89e43b77559307a95a42bf07e
+refs/heads/master: 2401dd25c70c07dcec8d7b5497cec4a7e74d2e31
diff --git a/trunk/drivers/media/video/davinci/Kconfig b/trunk/drivers/media/video/davinci/Kconfig
@@ -1,7 +1,7 @@
 config DISPLAY_DAVINCI_DM646X_EVM
 	tristate "DM646x EVM Video Display"
 	depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM
-	select VIDEOBUF_DMA_CONTIG
+	select VIDEOBUF2_DMA_CONTIG
 	select VIDEO_DAVINCI_VPIF
 	select VIDEO_ADV7343
 	select VIDEO_THS7303