From 3bb23593e9b938a79d153d093f4d18b9d334f6a9 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Tue, 20 Sep 2011 10:32:13 -0300 Subject: [PATCH] --- yaml --- r: 271855 b: refs/heads/master c: 3accb18ca14479d794e4b7a825abb93343f81855 h: refs/heads/master i: 271853: c504b9d0bef879806bf500c2d13766efec414e9e 271851: e5bb17c78abfeb3bae185b03fc88825616574187 271847: f43da2f5f039a34a43391896968f458d8b603597 271839: 6b02ec3f12e1e26d7c93b389813db07bf618ee21 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/Kconfig | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 3435f8443dac..3b7206deb0e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc3603248fecbdeb4a2c0568fc6606f257b6ca23 +refs/heads/master: 3accb18ca14479d794e4b7a825abb93343f81855 diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig index eb4fd6b44cab..f41ae69eb681 100644 --- a/trunk/drivers/media/video/Kconfig +++ b/trunk/drivers/media/video/Kconfig @@ -496,6 +496,20 @@ config VIDEO_TCM825X This is a driver for the Toshiba TCM825x VGA camera sensor. It is used for example in Nokia N800. +config VIDEO_SR030PC30 + tristate "Siliconfile SR030PC30 sensor support" + depends on I2C && VIDEO_V4L2 + ---help--- + This driver supports SR030PC30 VGA camera from Siliconfile + +config VIDEO_NOON010PC30 + tristate "Siliconfile NOON010PC30 sensor support" + depends on I2C && VIDEO_V4L2 && EXPERIMENTAL && VIDEO_V4L2_SUBDEV_API + ---help--- + This driver supports NOON010PC30 CIF camera from Siliconfile + +source "drivers/media/video/m5mols/Kconfig" + comment "Flash devices" config VIDEO_ADP1653 @@ -744,12 +758,6 @@ config VIDEO_M32R_AR_M64278 To compile this driver as a module, choose M here: the module will be called arv. -config VIDEO_SR030PC30 - tristate "SR030PC30 VGA camera sensor support" - depends on I2C && VIDEO_V4L2 - ---help--- - This driver supports SR030PC30 VGA camera from Siliconfile - config VIDEO_VIA_CAMERA tristate "VIAFB camera controller support" depends on FB_VIA @@ -760,14 +768,6 @@ config VIDEO_VIA_CAMERA Chrome9 chipsets. Currently only tested on OLPC xo-1.5 systems with ov7670 sensors. -config VIDEO_NOON010PC30 - tristate "NOON010PC30 CIF camera sensor support" - depends on I2C && VIDEO_V4L2 && EXPERIMENTAL && VIDEO_V4L2_SUBDEV_API - ---help--- - This driver supports NOON010PC30 CIF camera from Siliconfile - -source "drivers/media/video/m5mols/Kconfig" - config VIDEO_OMAP3 tristate "OMAP 3 Camera support (EXPERIMENTAL)" select OMAP_IOMMU