---

yaml --- r: 377179 b: refs/heads/master c: 4498757 h: refs/heads/master i: 377177: 830b4c4 377175: 37712ab v: v3
git-mirror · May 27, 2013 · c9ea3a3 · c9ea3a3
1 parent 7f44134
commit c9ea3a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c79b069d72f54ff0589e7615160420553aa4f04e
+refs/heads/master: 449875756055e2fff6074b4e69b35b9583f9f84d
diff --git a/trunk/drivers/staging/media/davinci_vpfe/Kconfig b/trunk/drivers/staging/media/davinci_vpfe/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_DM365_VPFE
 	tristate "DM365 VPFE Media Controller Capture Driver"
-	depends on VIDEO_V4L2 && ARCH_DAVINCI_DM365 && !VIDEO_VPFE_CAPTURE
+	depends on VIDEO_V4L2 && ARCH_DAVINCI_DM365 && !VIDEO_DM365_ISIF
 	select VIDEOBUF2_DMA_CONTIG
 	help
 	  Support for DM365 VPFE based Media Controller Capture driver.