diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-05-23 17:20:58 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-05-23 17:20:58 -0400 |
commit | 9528454f9c02fb9c359c4c42c69eed4d47407e39 (patch) | |
tree | 40e8c7f829b528073d2b216c3b8e6be205c76245 /drivers/media/video/usbvideo/Kconfig | |
parent | 777e1d4a0f3387933f668e7adc81384827975189 (diff) | |
parent | 1faadface9c5d000bb16e42c89f24859337cf2db (diff) | |
download | linux-9528454f9c02fb9c359c4c42c69eed4d47407e39.tar.gz |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/media/video/usbvideo/Kconfig')
-rw-r--r-- | drivers/media/video/usbvideo/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/usbvideo/Kconfig b/drivers/media/video/usbvideo/Kconfig index 08a5d20bb2c0..39269a2c5635 100644 --- 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_DEV && EXPERIMENTAL + depends on USB && 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_DEV + depends on USB && 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_DEV + depends on USB && VIDEO_V4L1 select VIDEO_USBVIDEO ---help--- Say Y here if you want support for webcams based on a Konica |