From 936ad1c54148e02177f2b97eac4907742268c0e6 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 3 May 2012 18:22:25 -0300 Subject: [PATCH] --- yaml --- r: 306417 b: refs/heads/master c: 14f2226022be6b169faeee3f0f6ca848170fdb3d h: refs/heads/master i: 306415: c33f3f8b501390ccc1619f05fab66e680032c447 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/davinci/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 39f2e64a4a18..811b17df123f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b66d2086c08dac16e6e4cec7642e9e10c4466336 +refs/heads/master: 14f2226022be6b169faeee3f0f6ca848170fdb3d diff --git a/trunk/drivers/media/video/davinci/Kconfig b/trunk/drivers/media/video/davinci/Kconfig index 60a456ebdc7c..9337b5605c90 100644 --- a/trunk/drivers/media/video/davinci/Kconfig +++ b/trunk/drivers/media/video/davinci/Kconfig @@ -40,6 +40,7 @@ config VIDEO_VPSS_SYSTEM config VIDEO_VPFE_CAPTURE tristate "VPFE Video Capture Driver" depends on VIDEO_V4L2 && (ARCH_DAVINCI || ARCH_OMAP3) + depends on I2C select VIDEOBUF_DMA_CONTIG help Support for DMx/AMx VPFE based frame grabber. This is the