summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/Kconfig
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-01 00:49:18 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-01 00:49:18 -0300
commit2b7963148161ef52cd30dcaee4d2e85d15675640 (patch)
tree9349712ee671028504c083846ea196926f7e2bc0 /linux/drivers/media/video/Kconfig
parent992d33ec3638c791da1943bef74f4e129d7c3c46 (diff)
parent624f231d397d2caaa0ca256824c99b21cd03f26d (diff)
downloadmediapointer-dvb-s2-2b7963148161ef52cd30dcaee4d2e85d15675640.tar.gz
mediapointer-dvb-s2-2b7963148161ef52cd30dcaee4d2e85d15675640.tar.bz2
merge: http://linuxtv.org/hg/~jfrancois/gspca/
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/Kconfig')
-rw-r--r--linux/drivers/media/video/Kconfig10
1 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig
index 603838441..adb82dc0f 100644
--- a/linux/drivers/media/video/Kconfig
+++ b/linux/drivers/media/video/Kconfig
@@ -793,7 +793,15 @@ menuconfig V4L_USB_DRIVERS
if V4L_USB_DRIVERS && USB
-source "drivers/media/video/gspca/Kconfig"
+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/gspca/Kconfig"
source "drivers/media/video/pvrusb2/Kconfig"