diff mbox

[v2,10/10] V4L2 patches for Intel Moorestown Camera Imaging Drivers

Message ID 33AB447FBD802F4E932063B962385B351D6D5354@shsmsx501.ccr.corp.intel.com (mailing list archive)
State RFC
Headers show

Commit Message

Xiaolin Zhang March 28, 2010, 7:48 a.m. UTC 
None
diff mbox

Patch

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index dcf9fa9..1b3726f 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -954,4 +954,5 @@  config USB_S2255
 	  This driver can be compiled as a module, called s2255drv.
 
 endif # V4L_USB_DRIVERS
+source "drivers/media/video/mrstci/Kconfig"
 endif # VIDEO_CAPTURE_DRIVERS
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 9f2e321..6a4b5ff 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -160,6 +160,15 @@  obj-$(CONFIG_USB_VIDEO_CLASS)	+= uvc/
 
 obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
 
+obj-$(CONFIG_VIDEO_MRST_OV2650) += mrstci/mrstov2650/
+obj-$(CONFIG_VIDEO_MRST_OV5630) += mrstci/mrstov5630/
+obj-$(CONFIG_VIDEO_MRST_OV5630_MOTOR) += mrstci/mrstov5630_motor/
+obj-$(CONFIG_VIDEO_MRST_S5K4E1) += mrstci/mrsts5k4e1/
+obj-$(CONFIG_VIDEO_MRST_S5K4E1_MOTOR) += mrstci/mrsts5k4e1_motor/
+obj-$(CONFIG_VIDEO_MRST_OV9665) += mrstci/mrstov9665/
+obj-$(CONFIG_VIDEO_MRST_FLASH) += mrstci/mrstflash/
+obj-$(CONFIG_VIDEO_MRST_ISP) += mrstci/mrstisp/
+
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
 EXTRA_CFLAGS += -Idrivers/media/common/tuners
diff --git a/drivers/media/video/mrstci/Kconfig b/drivers/media/video/mrstci/Kconfig
new file mode 100644
index 0000000..9ac7065
--- /dev/null
+++ b/drivers/media/video/mrstci/Kconfig
@@ -0,0 +1,26 @@ 
+menuconfig VIDEO_MRSTCI
+        bool "Moorestown Langwell Camera Imaging Subsystem support"
+        depends on VIDEO_V4L2
+        default y
+
+        ---help---
+	Say Y here to enable selecting the Intel Moorestown Langwell Camera Imaging Subsystem for webcams.
+
+if VIDEO_MRSTCI && VIDEO_V4L2
+
+source "drivers/media/video/mrstci/mrstisp/Kconfig"
+
+source "drivers/media/video/mrstci/mrstov5630/Kconfig"
+source "drivers/media/video/mrstci/mrstov5630_motor/Kconfig"
+
+source "drivers/media/video/mrstci/mrsts5k4e1/Kconfig"
+source "drivers/media/video/mrstci/mrsts5k4e1_motor/Kconfig"
+
+source "drivers/media/video/mrstci/mrstflash/Kconfig"
+
+source "drivers/media/video/mrstci/mrstov2650/Kconfig"
+
+source "drivers/media/video/mrstci/mrstov9665/Kconfig"
+
+endif # VIDEO_MRSTCI
+
diff --git a/drivers/media/video/mrstci/Makefile b/drivers/media/video/mrstci/Makefile
new file mode 100644
index 0000000..9d3449e
--- /dev/null
+++ b/drivers/media/video/mrstci/Makefile
@@ -0,0 +1,8 @@ 
+obj-$(CONFIG_VIDEO_MRST_OV2650) += mrstov2650/
+obj-$(CONFIG_VIDEO_MRST_OV9665) += mrstov9665/
+obj-$(CONFIG_VIDEO_MRST_OV5630) += mrstov5630/
+obj-$(CONFIG_VIDEO_MRST_OV5630_MOTOR) += mrstov5630_motor/
+obj-$(CONFIG_VIDEO_MRST_S5K4E1) += mrsts5k4e1/
+obj-$(CONFIG_VIDEO_MRST_S5K4E1_MOTOR) += mrsts5k4e1_motor/
+obj-$(CONFIG_VIDEO_MRST_FLASH) += mrstflash/
+obj-$(CONFIG_VIDEO_MRST_ISP) += mrstisp/