aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-02 19:23:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-02 19:23:52 -0700
commit3a57a788757738b8f80a82d4f5101fefb8fd7a58 (patch)
tree697a0e37cc3c7d02412f6743f52156897f7ba553 /drivers/media/video/Kconfig
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff)
parentV4L/DVB (8178): uvc: Fix compilation breakage for the other drivers, if uvc is selected (diff)
downloadlinux-dev-3a57a788757738b8f80a82d4f5101fefb8fd7a58.tar.xz
linux-dev-3a57a788757738b8f80a82d4f5101fefb8fd7a58.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (8178): uvc: Fix compilation breakage for the other drivers, if uvc is selected V4L/DVB (8145a): USB Video Class driver
Diffstat (limited to 'drivers/media/video/Kconfig')
-rw-r--r--drivers/media/video/Kconfig8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 3b26fbd3e558..5ccb0aeca8cc 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -793,6 +793,14 @@ menuconfig V4L_USB_DRIVERS
if V4L_USB_DRIVERS && USB
+config USB_VIDEO_CLASS
+ tristate "USB Video Class (UVC)"
+ ---help---
+ Support for the USB Video Class (UVC). Currently only video
+ input devices, such as webcams, are supported.
+
+ For more information see: <http://linux-uvc.berlios.de/>
+
source "drivers/media/video/pvrusb2/Kconfig"
source "drivers/media/video/em28xx/Kconfig"