---

yaml --- r: 261345 b: refs/heads/master c: b5210fd h: refs/heads/master i: 261343: 8b1db93 v: v3
git-mirror · Jul 27, 2011 · 0fad936 · 0fad936
1 parent ef59020
commit 0fad936
Show file tree

Hide file tree

Showing 4 changed files with 197 additions and 412 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3751e32961f22e256de85ebd585597ce5875037a
+refs/heads/master: b5210fd2c737dd178ff0401a0050dc62148fed60
diff --git a/trunk/drivers/media/video/marvell-ccic/Kconfig b/trunk/drivers/media/video/marvell-ccic/Kconfig
@@ -2,6 +2,7 @@ config VIDEO_CAFE_CCIC
 	tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"
 	depends on PCI && I2C && VIDEO_V4L2
 	select VIDEO_OV7670
+	select VIDEOBUF2_VMALLOC
 	---help---
 	  This is a video4linux2 driver for the Marvell 88ALP01 integrated
 	  CMOS camera controller.  This is the controller found on first-
@@ -12,6 +13,7 @@ config VIDEO_MMP_CAMERA
 	depends on ARCH_MMP && I2C && VIDEO_V4L2
 	select VIDEO_OV7670
 	select I2C_GPIO
+	select VIDEOBUF2_VMALLOC
 	---help---
 	  This is a Video4Linux2 driver for the integrated camera
 	  controller found on Marvell Armada 610 application