diff options
author | Dave Jones <davej@redhat.com> | 2006-06-30 00:01:54 +0400 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2006-06-30 00:01:54 +0400 |
commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
tree | 06a3183a562f8da4688f65023f7a18dcad702956 /drivers/media/video/usbvideo/Kconfig | |
parent | adf8a287150667feb5747f8beade62acacc17d4e (diff) | |
parent | 1f1332f727c3229eb2166a83fec5d3de6a73dce2 (diff) | |
download | linux-55b4d6a52195a8f277ffddf755ddaff359878f41.tar.xz |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
Diffstat (limited to 'drivers/media/video/usbvideo/Kconfig')
-rw-r--r-- | drivers/media/video/usbvideo/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/media/video/usbvideo/Kconfig b/drivers/media/video/usbvideo/Kconfig index 39269a2c5635..59fb899f31f3 100644 --- a/drivers/media/video/usbvideo/Kconfig +++ b/drivers/media/video/usbvideo/Kconfig @@ -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 + 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. + |