---

yaml --- r: 92372 b: refs/heads/master c: 3bc4384 h: refs/heads/master v: v3
git-mirror · Apr 24, 2008 · 4c7fc72 · 4c7fc72
1 parent d3d1245
commit 4c7fc72
Show file tree

Hide file tree

Showing 4 changed files with 946 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e55222ef27a2390d8abce27a3ce2d4c719ad5f1b
+refs/heads/master: 3bc43840c3fbffaf8216883a37b336a41050d7f7
diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig
@@ -845,4 +845,11 @@ config SOC_CAMERA
 	  over a bus like PCI or USB. For example some i2c camera connected
 	  directly to the data bus of an SoC.
 
+config VIDEO_PXA27x
+	tristate "PXA27x Quick Capture Interface driver"
+	depends on VIDEO_DEV && PXA27x
+	select SOC_CAMERA
+	---help---
+	  This is a v4l2 driver for the PXA27x Quick Capture Interface
+
 endif # VIDEO_CAPTURE_DRIVERS
diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile
@@ -136,6 +136,7 @@ obj-$(CONFIG_VIDEO_IVTV) += ivtv/
 obj-$(CONFIG_VIDEO_VIVI) += vivi.o
 obj-$(CONFIG_VIDEO_CX23885) += cx23885/
 
+obj-$(CONFIG_VIDEO_PXA27x)	+= pxa_camera.o
 obj-$(CONFIG_SOC_CAMERA)	+= soc_camera.o
 
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core