From f171728203e6a35e1241468cbc87fe46c166c107 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 9 Mar 2012 08:15:38 -0300 Subject: [PATCH] --- yaml --- r: 295081 b: refs/heads/master c: 0c22affebae259c140ee55134bc0cf29aea3878d h: refs/heads/master i: 295079: 4c0e4089f64e1ecc6b8d6ebcbec28265cd1b83a7 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3f59c13fbcaa..21d89f96de6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9080d5d3fa9888facd6898c6705b1a6713882955 +refs/heads/master: 0c22affebae259c140ee55134bc0cf29aea3878d diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig index 3cea9797740e..3651762b6fa2 100644 --- a/trunk/drivers/media/video/Kconfig +++ b/trunk/drivers/media/video/Kconfig @@ -1109,7 +1109,7 @@ config VIDEO_MX2_HOSTSUPPORT config VIDEO_MX2 tristate "i.MX27/i.MX25 Camera Sensor Interface driver" depends on VIDEO_DEV && SOC_CAMERA && (MACH_MX27 || ARCH_MX25) - select VIDEOBUF_DMA_CONTIG + select VIDEOBUF2_DMA_CONTIG select VIDEO_MX2_HOSTSUPPORT ---help--- This is a v4l2 driver for the i.MX27 and the i.MX25 Camera Sensor