---

yaml --- r: 357414 b: refs/heads/master c: 84a15de h: refs/heads/master v: v3
git-mirror · Feb 5, 2013 · f099177 · f099177
1 parent 1286216
commit f099177
Show file tree

Hide file tree

Showing 5 changed files with 1,598 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffa9b9f016a9c97a3cc205d0d634b10d8f72eb36
+refs/heads/master: 84a15ded76ec8ec23d84974238b7864813143655
diff --git a/trunk/drivers/media/i2c/Kconfig b/trunk/drivers/media/i2c/Kconfig
@@ -421,6 +421,13 @@ config VIDEO_OV7670
 	  OV7670 VGA camera.  It currently only works with the M88ALP01
 	  controller.
 
+config VIDEO_OV9650
+	tristate "OmniVision OV9650/OV9652 sensor support"
+	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+	---help---
+	  This is a V4L2 sensor-level driver for the Omnivision
+	  OV9650 and OV9652 camera sensors.
+
 config VIDEO_VS6624
 	tristate "ST VS6624 sensor support"
 	depends on VIDEO_V4L2 && I2C

diff --git a/trunk/drivers/media/i2c/Makefile b/trunk/drivers/media/i2c/Makefile
@@ -47,6 +47,7 @@ obj-$(CONFIG_VIDEO_VP27SMPX) += vp27smpx.o
 obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o
 obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o
 obj-$(CONFIG_VIDEO_OV7670) 	+= ov7670.o
+obj-$(CONFIG_VIDEO_OV9650) += ov9650.o
 obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o
 obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
 obj-$(CONFIG_VIDEO_MT9M032) += mt9m032.o