From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Mon, 7 Jul 2008 23:04:29 +0000 (-0300)
Subject: V4L/DVB (8234a): uvcvideo: Fix build for uvc input
X-Git-Tag: v2.6.27-rc1~31^2~81
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4c7827eec78abe6fe68fd29305806467f2a51e63;p=karo-tx-linux.git

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>
---

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index f606d2951fde..2a747db6dc3e 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -806,13 +806,7 @@ 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/uvc/Kconfig"
 
 source "drivers/media/video/gspca/Kconfig"