vserver 1.9.3

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

diff --git a/drivers/usb/media/Kconfig b/drivers/usb/media/Kconfig
index 00bf322..4ac7ac4 100644 (file)
--- a/drivers/usb/media/Kconfig
+++ b/drivers/usb/media/Kconfig
@@ -106,46 +106,6 @@ config USB_OV511
          To compile this driver as a module, choose M here: the
          module will be called ov511.
 
          To compile this driver as a module, choose M here: the
          module will be called ov511.
 

-config USB_PWC
-       tristate "USB Philips Cameras"
-       depends on USB && VIDEO_DEV
-       ---help---
-         Say Y or M here if you want to use one of these Philips & OEM
-          webcams:
-           * Philips PCA645, PCA646
-           * Philips PCVC675, PCVC680, PCVC690
-           * Philips PCVC720/40, PCVC730, PCVC740, PCVC750
-          * Askey VC010
-          * Logitech QuickCam Pro 3000, 4000, 'Zoom', 'Notebook Pro' 
-             and 'Orbit'/'Sphere'
-           * Samsung MPC-C10, MPC-C30
-          * Creative Webcam 5, Pro Ex
-          * SOTEC Afina Eye
-          * Visionite VCS-UC300, VCS-UM100
-          
-         The PCA635, PCVC665 and PCVC720/20 are not supported by this driver
-         and never will be, but the 665 and 720/20 are supported by other 
-         drivers.
-
-         This driver has an optional plugin (called PWCX), which is 
-         distributed as a binary module only. It contains code that allow you 
-         to use higher resolutions and framerates but may not be distributed 
-         as source. But even without this plugin you can these cams for most
-         applications.
-
-         See <file:Documentation/usb/philips.txt> for more information and
-         installation instructions.
-
-         The built-in microphone is enabled by selecting USB Audio support.
-
-         This driver uses the Video For Linux API. You must say Y or M to
-         "Video For Linux" (under Character Devices) to use this driver.
-         Information on this API and pointers to "v4l" programs may be found
-         at <file:Documentation/video4linux/API.html>.
-
-         To compile this driver as a module, choose M here: the
-         module will be called pwc.
-

 config USB_SE401
        tristate "USB SE401 Camera support"
        depends on USB && VIDEO_DEV
 config USB_SE401
        tristate "USB SE401 Camera support"
        depends on USB && VIDEO_DEV


@@ -162,6 +122,21 @@ config USB_SE401
          To compile this driver as a module, choose M here: the
          module will be called 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"
+       depends on USB && VIDEO_DEV
+       ---help---
+         Say Y here if you want support for cameras based on SONiX SN9C101
+         or 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
 config USB_STV680
        tristate "USB STV680 (Pencam) Camera support"
        depends on USB && VIDEO_DEV


@@ -181,7 +156,7 @@ config USB_STV680
 
 config USB_W9968CF
        tristate "USB W996[87]CF JPEG Dual Mode Camera support"
 
 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.
        ---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 +165,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.
          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.