---

yaml --- r: 357510 b: refs/heads/master c: 8dc97ea h: refs/heads/master v: v3
git-mirror · Feb 6, 2013 · 3b6aa9e · 3b6aa9e
1 parent 1db18cd
commit 3b6aa9e
Show file tree

Hide file tree

Showing 3 changed files with 435 additions and 642 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5815d0c4d55a80310138698c9dc516c759b6be87
+refs/heads/master: 8dc97ea20c2bdf406348640abbd35eb89c843957
diff --git a/trunk/drivers/media/pci/sta2x11/Kconfig b/trunk/drivers/media/pci/sta2x11/Kconfig
@@ -2,7 +2,7 @@ config STA2X11_VIP
 	tristate "STA2X11 VIP Video For Linux"
 	depends on STA2X11
 	select VIDEO_ADV7180 if MEDIA_SUBDRV_AUTOSELECT
-	select VIDEOBUF_DMA_CONTIG
+	select VIDEOBUF2_DMA_CONTIG
 	depends on PCI && VIDEO_V4L2 && VIRT_TO_BUS
 	help
 	  Say Y for support for STA2X11 VIP (Video Input Port) capture