VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / usb / media / Kconfig

diff --git a/drivers/usb/media/Kconfig b/drivers/usb/media/Kconfig
index 00bf322..6dac4dc 100644 (file)
--- a/drivers/usb/media/Kconfig
+++ b/drivers/usb/media/Kconfig
@@ -162,6 +162,21 @@ config USB_SE401
          To compile this driver as a module, choose M here: the
          module will be called se401.
 
+config USB_SN9C102
+       tristate "USB SN9C10[12] PC Camera Controller support (EXPERIMENTAL)"
+       depends on USB && VIDEO_DEV && EXPERIMENTAL
+       ---help---
+         Say Y here if you want support for cameras based on SN9C101 and
+         SN9C102 PC Camera Controllers.
+
+         See <file:Documentation/usb/sn9c102.txt> for more informations.
+
+         This driver uses the Video For Linux API. You must say Y or M to
+         "Video For Linux" to use this driver.
+
+         To compile this driver as a module, choose M here: the
+         module will be called sn9c102.
+
 config USB_STV680
        tristate "USB STV680 (Pencam) Camera support"
        depends on USB && VIDEO_DEV
@@ -181,7 +196,7 @@ config USB_STV680
 
 config USB_W9968CF
        tristate "USB W996[87]CF JPEG Dual Mode Camera support"
-       depends on USB && VIDEO_DEV && I2C
+       depends on USB && VIDEO_DEV && I2C && VIDEO_OVCAMCHIP
        ---help---
          Say Y here if you want support for cameras based on OV681 or
          Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.
@@ -190,16 +205,13 @@ config USB_W9968CF
          separate module only (released under GPL). It allows to use higher 
          resolutions and framerates, but cannot be included in the official 
          Linux kernel for performance purposes.
-         At the moment the driver needs a third-party module for the CMOS 
-         sensors, which is available on internet: it is recommended to read
-         <file:Documentation/usb/w9968cf.txt> for more informations and for
-         a list of supported cameras.
-       
-         This driver uses the Video For Linux and the I2C APIs. You must say
-         Y or M to both "Video For Linux" and "I2C Support" to use this 
-         driver.
-       
-         This code is also available as a module ( = code which can be
-         inserted in and removed from the running kernel whenever you want).
-         The module will be called w9968cf.o. If you want to compile it as a
-         module, say M here and read <file:Documentation/kbuild/modules.txt>.
+
+         See <file:Documentation/usb/w9968cf.txt> for more informations.
+
+         This driver uses the Video For Linux and the I2C APIs. It needs the
+         OmniVision Camera Chip support as well. You must say Y or M to
+         "Video For Linux", "I2C Support" and "OmniVision Camera Chip 
+         support" to use this driver.
+
+         To compile this driver as a module, choose M here: the
+         module will be called w9968cf.