---

yaml --- r: 343918 b: refs/heads/master c: 13fc23d h: refs/heads/master v: v3
git-mirror · Nov 21, 2012 · 2773b20 · 2773b20
1 parent 59ba5ac
commit 2773b20
Show file tree

Hide file tree

Showing 4 changed files with 188 additions and 125 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: baa29837a76d5738837602ff249a0c371591d7c7
+refs/heads/master: 13fc23d3067e996c03d8b602266f47d27d205d36
diff --git a/trunk/drivers/media/platform/davinci/Kconfig b/trunk/drivers/media/platform/davinci/Kconfig
@@ -101,7 +101,7 @@ config VIDEO_DM644X_VPBE
 	tristate "DM644X VPBE HW module"
 	depends on ARCH_DAVINCI_DM644x
 	select VIDEO_VPSS_SYSTEM
-	select VIDEOBUF_DMA_CONTIG
+	select VIDEOBUF2_DMA_CONTIG
 	help
 	    Enables VPBE modules used for display on a DM644x
 	    SoC.