From c9ea3a31291601b85aef9fbc16b1d7a9e2bda858 Mon Sep 17 00:00:00 2001 From: "Lad, Prabhakar" Date: Mon, 13 May 2013 06:39:07 -0300 Subject: [PATCH] --- yaml --- r: 377179 b: refs/heads/master c: 449875756055e2fff6074b4e69b35b9583f9f84d h: refs/heads/master i: 377177: 830b4c44771412140424454d3e7315ede84a7931 377175: 37712aba53c90696b58cf1dd3089f8b9be85546f v: v3 --- [refs] | 2 +- trunk/drivers/staging/media/davinci_vpfe/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f8e5b2554b0b..8b237b1f8265 100644 --- 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 index 2e4a28b018e8..12f321dd2399 100644 --- 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.