V4L/DVB (3599a): Move drivers/usb/media to drivers/media/video

Because of historic reasons, there are two separate directories with
V4L stuff. Most drivers are located at driver/media/video. However, some
code for USB Webcams were inserted under drivers/usb/media.

This makes difficult for module authors to know were things should be.
Also, makes Kconfig menu confusing for normal users.

This patch moves all V4L content under drivers/usb/media to
drivers/media/video, and fixes Kconfig/Makefile entries.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 0 insertions, 14 deletions

diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index bb36a1c1dbb3..9b7d9769fdcc 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -35,20 +35,6 @@ obj-$(CONFIG_USB_WACOM)		+= input/
 obj-$(CONFIG_USB_ACECAD)        += input/
 obj-$(CONFIG_USB_XPAD)          += input/
 
-obj-$(CONFIG_USB_DABUSB)        += media/
-obj-$(CONFIG_USB_DSBR)          += media/
-obj-$(CONFIG_USB_ET61X251)      += media/
-obj-$(CONFIG_USB_IBMCAM)        += media/
-obj-$(CONFIG_USB_KONICAWC)      += media/
-obj-$(CONFIG_USB_OV511)         += media/
-obj-$(CONFIG_USB_PWC)           += media/
-obj-$(CONFIG_USB_SE401)         += media/
-obj-$(CONFIG_USB_SN9C102)       += media/
-obj-$(CONFIG_USB_STV680)        += media/
-obj-$(CONFIG_USB_VICAM)         += media/
-obj-$(CONFIG_USB_W9968CF)       += media/
-obj-$(CONFIG_USB_ZC0301)        += media/
-
 obj-$(CONFIG_USB_CATC)          += net/
 obj-$(CONFIG_USB_KAWETH)        += net/
 obj-$(CONFIG_USB_PEGASUS)       += net/