Merge branch 'master' into upstream-fixes

[linux-2.6] / drivers / media / video / usbvideo / Kconfig

diff --git a/drivers/media/video/usbvideo/Kconfig b/drivers/media/video/usbvideo/Kconfig
index 39269a2..a0fd82b 100644 (file)
--- a/drivers/media/video/usbvideo/Kconfig
+++ b/drivers/media/video/usbvideo/Kconfig
@@ -3,7 +3,7 @@ config VIDEO_USBVIDEO
 
 config USB_VICAM
        tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"
-       depends on USB && VIDEO_V4L1 && EXPERIMENTAL
+       depends on USB && VIDEO_DEV && VIDEO_V4L1 && EXPERIMENTAL
        select VIDEO_USBVIDEO
        ---help---
          Say Y here if you have 3com homeconnect camera (vicam).
@@ -13,7 +13,7 @@ config USB_VICAM
 
 config USB_IBMCAM
        tristate "USB IBM (Xirlink) C-it Camera support"
-       depends on USB && VIDEO_V4L1
+       depends on USB && VIDEO_DEV && VIDEO_V4L1
        select VIDEO_USBVIDEO
        ---help---
          Say Y here if you want to connect a IBM "C-It" camera, also known as
@@ -28,7 +28,7 @@ config USB_IBMCAM
 
 config USB_KONICAWC
        tristate "USB Konica Webcam support"
-       depends on USB && VIDEO_V4L1
+       depends on USB && VIDEO_DEV && VIDEO_V4L1
        select VIDEO_USBVIDEO
        ---help---
          Say Y here if you want support for webcams based on a Konica
@@ -36,3 +36,15 @@ config USB_KONICAWC
 
          To compile this driver as a module, choose M here: the
          module will be called konicawc.
+
+config USB_QUICKCAM_MESSENGER
+       tristate "USB Logitech Quickcam Messenger"
+       depends on USB && VIDEO_DEV && VIDEO_V4L1
+       select VIDEO_USBVIDEO
+       ---help---
+         Say Y or M here to enable support for the USB Logitech Quickcam
+         Messenger webcam.
+
+         To compile this driver as a module, choose M here: the
+         module will be called quickcam_messenger.
+