diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-03 14:42:44 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-03 14:42:44 -0300 |
| commit | 57e14767e52981fbf43bcc229c10281e2b8fbfe2 (patch) | |
| tree | 3b199bff33dcb1d6413db5c998f0f262a7376a3f /linux/drivers/media/video/usbvideo | |
| parent | adda8d4f7c83d79ad19f58d2293050c34cc4b464 (diff) | |
| parent | cf1ab0d168c5d827c0d26693162ccdf0a3833e95 (diff) | |
| download | mediapointer-dvb-s2-57e14767e52981fbf43bcc229c10281e2b8fbfe2.tar.gz mediapointer-dvb-s2-57e14767e52981fbf43bcc229c10281e2b8fbfe2.tar.bz2 | |
Merging the reverting patches
Diffstat (limited to 'linux/drivers/media/video/usbvideo')
| -rw-r--r-- | linux/drivers/media/video/usbvideo/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/usbvideo/Kconfig b/linux/drivers/media/video/usbvideo/Kconfig index e4cb99c1f..a0fd82b92 100644 --- a/linux/drivers/media/video/usbvideo/Kconfig +++ b/linux/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 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 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 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 @@ -39,7 +39,7 @@ config USB_KONICAWC config USB_QUICKCAM_MESSENGER tristate "USB Logitech Quickcam Messenger" - depends on VIDEO_V4L1 + depends on USB && VIDEO_DEV && VIDEO_V4L1 select VIDEO_USBVIDEO ---help--- Say Y or M here to enable support for the USB Logitech Quickcam |