aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-07 19:04:29 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-24 12:46:19 -0400
commit4c7827eec78abe6fe68fd29305806467f2a51e63 (patch)
tree0c0fb7a63996c132a6852e135ee5dd8acb992673 /drivers/media
parent10b0e96ed9a1ce0412ef981cf6250f9de3c80b02 (diff)
V4L/DVB (8234a): uvcvideo: Fix build for uvc input
Fix a bug introduced by some trouble on my -git tree that resulted on a hunk to be lost (probably caused by some rebase). Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/Kconfig8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index f606d2951fd..2a747db6dc3 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -806,13 +806,7 @@ menuconfig V4L_USB_DRIVERS
806 806
807if V4L_USB_DRIVERS && USB 807if V4L_USB_DRIVERS && USB
808 808
809config USB_VIDEO_CLASS 809source "drivers/media/video/uvc/Kconfig"
810 tristate "USB Video Class (UVC)"
811 ---help---
812 Support for the USB Video Class (UVC). Currently only video
813 input devices, such as webcams, are supported.
814
815 For more information see: <http://linux-uvc.berlios.de/>
816 810
817source "drivers/media/video/gspca/Kconfig" 811source "drivers/media/video/gspca/Kconfig"
818 812