Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

1 files changed, 1 insertions, 18 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index f606d2951fde..d4a6e56a7135 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -487,17 +487,6 @@ config VIDEO_PMS
           To compile this driver as a module, choose M here: the
           module will be called pms.
 
-config VIDEO_PLANB
-        tristate "PlanB Video-In on PowerMac"
-        depends on PPC_PMAC && VIDEO_V4L1 && BROKEN
-        help
-          PlanB is the V4L driver for the PowerMac 7x00/8x00 series video
-          input hardware. If you want to experiment with this, say Y.
-          Otherwise, or if you don't understand a word, say N. See
-          <http://www.cpu.lu/~mlan/linux/dev/planb.html> for more info.
-
-          Saying M will compile this driver as a module (planb).
-
 config VIDEO_BWQCAM
         tristate "Quickcam BW Video For Linux"
         depends on PARPORT && VIDEO_V4L1
@@ -806,13 +795,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"