This commit was generated by cvs2svn to compensate for changes in r1129,

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

diff --git a/drivers/usb/media/Kconfig b/drivers/usb/media/Kconfig
index 6dac4dc..0d3d2cc 100644 (file)
--- a/drivers/usb/media/Kconfig
+++ b/drivers/usb/media/Kconfig
@@ -53,6 +53,21 @@ config USB_DSBR
          To compile this driver as a module, choose M here: the
          module will be called dsbr100.
 
+config USB_ET61X251
+       tristate "USB ET61X[12]51 PC Camera Controller support"
+       depends on USB && VIDEO_DEV
+       ---help---
+         Say Y here if you want support for cameras based on Etoms ET61X151
+         or ET61X251 PC Camera Controllers.
+
+         See <file:Documentation/usb/et61x251.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 et61x251.
+
 config USB_IBMCAM
        tristate "USB IBM (Xirlink) C-it Camera support"
        depends on USB && VIDEO_DEV
@@ -106,46 +121,6 @@ config USB_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
@@ -163,11 +138,11 @@ config USB_SE401
          module will be called se401.
 
 config USB_SN9C102
-       tristate "USB SN9C10[12] PC Camera Controller support (EXPERIMENTAL)"
-       depends on USB && VIDEO_DEV && EXPERIMENTAL
+       tristate "USB SN9C10x PC Camera Controller support"
+       depends on USB && VIDEO_DEV
        ---help---
-         Say Y here if you want support for cameras based on SN9C101 and
-         SN9C102 PC Camera Controllers.
+         Say Y here if you want support for cameras based on SONiX SN9C101,
+         SN9C102 or SN9C103 PC Camera Controllers.
 
          See <file:Documentation/usb/sn9c102.txt> for more informations.
 
@@ -215,3 +190,37 @@ config USB_W9968CF
 
          To compile this driver as a module, choose M here: the
          module will be called w9968cf.
+
+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.
+
+         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.