[media] dvb-usb: move it to drivers/media/usb/dvb-usb

As media/dvb will be removed, move it to a proper place.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Documentation/dvb/README.dvb-usb

diff --git a/Documentation/dvb/README.dvb-usb b/Documentation/dvb/README.dvb-usb
index c4d963a6..8eb9226 100644
--- a/Documentation/dvb/README.dvb-usb
+++ b/Documentation/dvb/README.dvb-usb
@@ -30,7 +30,7 @@
 is done via callbacks, assigned in a static device-description (struct
 dvb_usb_device) each device-driver has to have.
 
-For an example have a look in drivers/media/dvb/dvb-usb/vp7045*.
+For an example have a look in drivers/media/usb/dvb-usb/vp7045*.
 
 Objective is to migrate all the usb-devices (dibusb, cinergyT2, maybe the
 ttusb; flexcop-usb already benefits from the generic flexcop-device) to use

drivers/media/Kconfig

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index b7d2802..26da8b8 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -163,6 +163,7 @@
 
 source "drivers/media/dvb-core/Kconfig"
 source "drivers/media/dvb/Kconfig"
+source "drivers/media/usb/Kconfig"
 
 comment "Supported FireWire (IEEE 1394) Adapters"
 	depends on DVB_CORE && FIREWIRE

drivers/media/Makefile

diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 37e448c..46a8dc3 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -11,5 +11,5 @@
 obj-y += v4l2-core/ common/ rc/ video/
 
 obj-$(CONFIG_VIDEO_DEV) += radio/
-obj-$(CONFIG_DVB_CORE)  += dvb-core/ dvb/ dvb-frontends/
+obj-$(CONFIG_DVB_CORE)  += dvb-core/ dvb/ dvb-frontends/ usb/
 obj-$(CONFIG_DVB_FIREDTV) += firewire/

drivers/media/dvb/Kconfig

diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index b466546..e2565a4 100644
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -15,14 +15,6 @@
 	depends on DVB_CORE && PCI && I2C
 source "drivers/media/dvb/ttpci/Kconfig"
 
-comment "Supported USB Adapters"
-	depends on DVB_CORE && USB && I2C
-source "drivers/media/dvb/dvb-usb/Kconfig"
-source "drivers/media/dvb/dvb-usb-v2/Kconfig"
-source "drivers/media/dvb/ttusb-budget/Kconfig"
-source "drivers/media/dvb/ttusb-dec/Kconfig"
-source "drivers/media/dvb/siano/Kconfig"
-
 comment "Supported FlexCopII (B2C2) Adapters"
 	depends on DVB_CORE && (PCI || USB) && I2C
 source "drivers/media/dvb/b2c2/Kconfig"

drivers/media/dvb/Makefile

diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile
index fc24826..c5fa43a 100644
--- a/drivers/media/dvb/Makefile
+++ b/drivers/media/dvb/Makefile
@@ -3,14 +3,9 @@
 #
 
 obj-y        :=	ttpci/		\
-		ttusb-dec/	\
-		ttusb-budget/	\
 		b2c2/		\
 		bt8xx/		\
-		dvb-usb/	\
-		dvb-usb-v2/	\
 		pluto2/		\
-		siano/		\
 		dm1105/		\
 		pt1/		\
 		mantis/		\

drivers/media/usb/Kconfig

diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
new file mode 100644
index 0000000..70b1708
--- /dev/null
+++ b/drivers/media/usb/Kconfig
@@ -0,0 +1,18 @@
+#
+# USB media device configuration
+#
+
+menuconfig MEDIA_USB_DRIVERS
+	bool "Supported DVB USB Adapters"
+        depends on USB
+        default y
+
+if MEDIA_USB_DRIVERS && DVB_CORE && I2C
+
+source "drivers/media/usb/dvb-usb/Kconfig"
+source "drivers/media/usb/dvb-usb-v2/Kconfig"
+source "drivers/media/usb/ttusb-budget/Kconfig"
+source "drivers/media/usb/ttusb-dec/Kconfig"
+source "drivers/media/usb/siano/Kconfig"
+
+endif

drivers/media/usb/Makefile

diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
new file mode 100644
index 0000000..44e29f3
--- /dev/null
+++ b/drivers/media/usb/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the USB media device drivers
+#
+
+# DVB USB-only drivers
+obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/

drivers/media/usb/dvb-usb-v2/Kconfig

diff --git a/drivers/media/dvb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/Kconfig
rename to drivers/media/usb/dvb-usb-v2/Kconfig

drivers/media/usb/dvb-usb-v2/Makefile

diff --git a/drivers/media/dvb/dvb-usb-v2/Makefile b/drivers/media/usb/dvb-usb-v2/Makefile
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/Makefile
rename to drivers/media/usb/dvb-usb-v2/Makefile

drivers/media/usb/dvb-usb-v2/af9015.c

diff --git a/drivers/media/dvb/dvb-usb-v2/af9015.c b/drivers/media/usb/dvb-usb-v2/af9015.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/af9015.c
rename to drivers/media/usb/dvb-usb-v2/af9015.c

drivers/media/usb/dvb-usb-v2/af9015.h

diff --git a/drivers/media/dvb/dvb-usb-v2/af9015.h b/drivers/media/usb/dvb-usb-v2/af9015.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/af9015.h
rename to drivers/media/usb/dvb-usb-v2/af9015.h

drivers/media/usb/dvb-usb-v2/af9035.c

diff --git a/drivers/media/dvb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/af9035.c
rename to drivers/media/usb/dvb-usb-v2/af9035.c

drivers/media/usb/dvb-usb-v2/af9035.h

diff --git a/drivers/media/dvb/dvb-usb-v2/af9035.h b/drivers/media/usb/dvb-usb-v2/af9035.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/af9035.h
rename to drivers/media/usb/dvb-usb-v2/af9035.h

drivers/media/usb/dvb-usb-v2/anysee.c

diff --git a/drivers/media/dvb/dvb-usb-v2/anysee.c b/drivers/media/usb/dvb-usb-v2/anysee.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/anysee.c
rename to drivers/media/usb/dvb-usb-v2/anysee.c

drivers/media/usb/dvb-usb-v2/anysee.h

diff --git a/drivers/media/dvb/dvb-usb-v2/anysee.h b/drivers/media/usb/dvb-usb-v2/anysee.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/anysee.h
rename to drivers/media/usb/dvb-usb-v2/anysee.h

drivers/media/usb/dvb-usb-v2/au6610.c

diff --git a/drivers/media/dvb/dvb-usb-v2/au6610.c b/drivers/media/usb/dvb-usb-v2/au6610.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/au6610.c
rename to drivers/media/usb/dvb-usb-v2/au6610.c

drivers/media/usb/dvb-usb-v2/au6610.h

diff --git a/drivers/media/dvb/dvb-usb-v2/au6610.h b/drivers/media/usb/dvb-usb-v2/au6610.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/au6610.h
rename to drivers/media/usb/dvb-usb-v2/au6610.h

drivers/media/usb/dvb-usb-v2/az6007.c

diff --git a/drivers/media/dvb/dvb-usb-v2/az6007.c b/drivers/media/usb/dvb-usb-v2/az6007.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/az6007.c
rename to drivers/media/usb/dvb-usb-v2/az6007.c

drivers/media/usb/dvb-usb-v2/ce6230.c

diff --git a/drivers/media/dvb/dvb-usb-v2/ce6230.c b/drivers/media/usb/dvb-usb-v2/ce6230.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/ce6230.c
rename to drivers/media/usb/dvb-usb-v2/ce6230.c

drivers/media/usb/dvb-usb-v2/ce6230.h

diff --git a/drivers/media/dvb/dvb-usb-v2/ce6230.h b/drivers/media/usb/dvb-usb-v2/ce6230.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/ce6230.h
rename to drivers/media/usb/dvb-usb-v2/ce6230.h

drivers/media/usb/dvb-usb-v2/cypress_firmware.c

diff --git a/drivers/media/dvb/dvb-usb-v2/cypress_firmware.c b/drivers/media/usb/dvb-usb-v2/cypress_firmware.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/cypress_firmware.c
rename to drivers/media/usb/dvb-usb-v2/cypress_firmware.c

drivers/media/usb/dvb-usb-v2/cypress_firmware.h

diff --git a/drivers/media/dvb/dvb-usb-v2/cypress_firmware.h b/drivers/media/usb/dvb-usb-v2/cypress_firmware.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/cypress_firmware.h
rename to drivers/media/usb/dvb-usb-v2/cypress_firmware.h

drivers/media/usb/dvb-usb-v2/dvb_usb.h

diff --git a/drivers/media/dvb/dvb-usb-v2/dvb_usb.h b/drivers/media/usb/dvb-usb-v2/dvb_usb.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/dvb_usb.h
rename to drivers/media/usb/dvb-usb-v2/dvb_usb.h

drivers/media/usb/dvb-usb-v2/dvb_usb_common.h

diff --git a/drivers/media/dvb/dvb-usb-v2/dvb_usb_common.h b/drivers/media/usb/dvb-usb-v2/dvb_usb_common.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/dvb_usb_common.h
rename to drivers/media/usb/dvb-usb-v2/dvb_usb_common.h

drivers/media/usb/dvb-usb-v2/dvb_usb_core.c

diff --git a/drivers/media/dvb/dvb-usb-v2/dvb_usb_core.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/dvb_usb_core.c
rename to drivers/media/usb/dvb-usb-v2/dvb_usb_core.c

drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c

diff --git a/drivers/media/dvb/dvb-usb-v2/dvb_usb_urb.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/dvb_usb_urb.c
rename to drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c

drivers/media/usb/dvb-usb-v2/ec168.c

diff --git a/drivers/media/dvb/dvb-usb-v2/ec168.c b/drivers/media/usb/dvb-usb-v2/ec168.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/ec168.c
rename to drivers/media/usb/dvb-usb-v2/ec168.c

drivers/media/usb/dvb-usb-v2/ec168.h

diff --git a/drivers/media/dvb/dvb-usb-v2/ec168.h b/drivers/media/usb/dvb-usb-v2/ec168.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/ec168.h
rename to drivers/media/usb/dvb-usb-v2/ec168.h

drivers/media/usb/dvb-usb-v2/gl861.c

diff --git a/drivers/media/dvb/dvb-usb-v2/gl861.c b/drivers/media/usb/dvb-usb-v2/gl861.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/gl861.c
rename to drivers/media/usb/dvb-usb-v2/gl861.c

drivers/media/usb/dvb-usb-v2/gl861.h

diff --git a/drivers/media/dvb/dvb-usb-v2/gl861.h b/drivers/media/usb/dvb-usb-v2/gl861.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/gl861.h
rename to drivers/media/usb/dvb-usb-v2/gl861.h

drivers/media/usb/dvb-usb-v2/it913x.c

diff --git a/drivers/media/dvb/dvb-usb-v2/it913x.c b/drivers/media/usb/dvb-usb-v2/it913x.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/it913x.c
rename to drivers/media/usb/dvb-usb-v2/it913x.c

drivers/media/usb/dvb-usb-v2/lmedm04.c

diff --git a/drivers/media/dvb/dvb-usb-v2/lmedm04.c b/drivers/media/usb/dvb-usb-v2/lmedm04.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/lmedm04.c
rename to drivers/media/usb/dvb-usb-v2/lmedm04.c

drivers/media/usb/dvb-usb-v2/lmedm04.h

diff --git a/drivers/media/dvb/dvb-usb-v2/lmedm04.h b/drivers/media/usb/dvb-usb-v2/lmedm04.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/lmedm04.h
rename to drivers/media/usb/dvb-usb-v2/lmedm04.h

drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c

diff --git a/drivers/media/dvb/dvb-usb-v2/mxl111sf-demod.c b/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/mxl111sf-demod.c
rename to drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c

drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h

diff --git a/drivers/media/dvb/dvb-usb-v2/mxl111sf-demod.h b/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/mxl111sf-demod.h
rename to drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h

drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.c

diff --git a/drivers/media/dvb/dvb-usb-v2/mxl111sf-gpio.c b/drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/mxl111sf-gpio.c
rename to drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.c

drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h

diff --git a/drivers/media/dvb/dvb-usb-v2/mxl111sf-gpio.h b/drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/mxl111sf-gpio.h
rename to drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h

drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c

diff --git a/drivers/media/dvb/dvb-usb-v2/mxl111sf-i2c.c b/drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/mxl111sf-i2c.c
rename to drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c

drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h

diff --git a/drivers/media/dvb/dvb-usb-v2/mxl111sf-i2c.h b/drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/mxl111sf-i2c.h
rename to drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h

drivers/media/usb/dvb-usb-v2/mxl111sf-phy.c

diff --git a/drivers/media/dvb/dvb-usb-v2/mxl111sf-phy.c b/drivers/media/usb/dvb-usb-v2/mxl111sf-phy.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/mxl111sf-phy.c
rename to drivers/media/usb/dvb-usb-v2/mxl111sf-phy.c

drivers/media/usb/dvb-usb-v2/mxl111sf-phy.h

diff --git a/drivers/media/dvb/dvb-usb-v2/mxl111sf-phy.h b/drivers/media/usb/dvb-usb-v2/mxl111sf-phy.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/mxl111sf-phy.h
rename to drivers/media/usb/dvb-usb-v2/mxl111sf-phy.h

drivers/media/usb/dvb-usb-v2/mxl111sf-reg.h

diff --git a/drivers/media/dvb/dvb-usb-v2/mxl111sf-reg.h b/drivers/media/usb/dvb-usb-v2/mxl111sf-reg.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/mxl111sf-reg.h
rename to drivers/media/usb/dvb-usb-v2/mxl111sf-reg.h

drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c

diff --git a/drivers/media/dvb/dvb-usb-v2/mxl111sf-tuner.c b/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/mxl111sf-tuner.c
rename to drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c

drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h

diff --git a/drivers/media/dvb/dvb-usb-v2/mxl111sf-tuner.h b/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/mxl111sf-tuner.h
rename to drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h

drivers/media/usb/dvb-usb-v2/mxl111sf.c

diff --git a/drivers/media/dvb/dvb-usb-v2/mxl111sf.c b/drivers/media/usb/dvb-usb-v2/mxl111sf.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/mxl111sf.c
rename to drivers/media/usb/dvb-usb-v2/mxl111sf.c

drivers/media/usb/dvb-usb-v2/mxl111sf.h

diff --git a/drivers/media/dvb/dvb-usb-v2/mxl111sf.h b/drivers/media/usb/dvb-usb-v2/mxl111sf.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/mxl111sf.h
rename to drivers/media/usb/dvb-usb-v2/mxl111sf.h

drivers/media/usb/dvb-usb-v2/rtl28xxu.c

diff --git a/drivers/media/dvb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/rtl28xxu.c
rename to drivers/media/usb/dvb-usb-v2/rtl28xxu.c

drivers/media/usb/dvb-usb-v2/rtl28xxu.h

diff --git a/drivers/media/dvb/dvb-usb-v2/rtl28xxu.h b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/rtl28xxu.h
rename to drivers/media/usb/dvb-usb-v2/rtl28xxu.h

drivers/media/usb/dvb-usb-v2/usb_urb.c

diff --git a/drivers/media/dvb/dvb-usb-v2/usb_urb.c b/drivers/media/usb/dvb-usb-v2/usb_urb.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb-v2/usb_urb.c
rename to drivers/media/usb/dvb-usb-v2/usb_urb.c

drivers/media/usb/dvb-usb/Kconfig

diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/usb/dvb-usb/Kconfig
similarity index 100%
rename from drivers/media/dvb/dvb-usb/Kconfig
rename to drivers/media/usb/dvb-usb/Kconfig

drivers/media/usb/dvb-usb/Makefile

diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/usb/dvb-usb/Makefile
similarity index 100%
rename from drivers/media/dvb/dvb-usb/Makefile
rename to drivers/media/usb/dvb-usb/Makefile

drivers/media/usb/dvb-usb/a800.c

diff --git a/drivers/media/dvb/dvb-usb/a800.c b/drivers/media/usb/dvb-usb/a800.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/a800.c
rename to drivers/media/usb/dvb-usb/a800.c

drivers/media/usb/dvb-usb/af9005-fe.c

diff --git a/drivers/media/dvb/dvb-usb/af9005-fe.c b/drivers/media/usb/dvb-usb/af9005-fe.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/af9005-fe.c
rename to drivers/media/usb/dvb-usb/af9005-fe.c

drivers/media/usb/dvb-usb/af9005-remote.c

diff --git a/drivers/media/dvb/dvb-usb/af9005-remote.c b/drivers/media/usb/dvb-usb/af9005-remote.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/af9005-remote.c
rename to drivers/media/usb/dvb-usb/af9005-remote.c

drivers/media/usb/dvb-usb/af9005-script.h

diff --git a/drivers/media/dvb/dvb-usb/af9005-script.h b/drivers/media/usb/dvb-usb/af9005-script.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/af9005-script.h
rename to drivers/media/usb/dvb-usb/af9005-script.h

drivers/media/usb/dvb-usb/af9005.c

diff --git a/drivers/media/dvb/dvb-usb/af9005.c b/drivers/media/usb/dvb-usb/af9005.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/af9005.c
rename to drivers/media/usb/dvb-usb/af9005.c

drivers/media/usb/dvb-usb/af9005.h

diff --git a/drivers/media/dvb/dvb-usb/af9005.h b/drivers/media/usb/dvb-usb/af9005.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/af9005.h
rename to drivers/media/usb/dvb-usb/af9005.h

drivers/media/usb/dvb-usb/az6027.c

diff --git a/drivers/media/dvb/dvb-usb/az6027.c b/drivers/media/usb/dvb-usb/az6027.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/az6027.c
rename to drivers/media/usb/dvb-usb/az6027.c

drivers/media/usb/dvb-usb/az6027.h

diff --git a/drivers/media/dvb/dvb-usb/az6027.h b/drivers/media/usb/dvb-usb/az6027.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/az6027.h
rename to drivers/media/usb/dvb-usb/az6027.h

drivers/media/usb/dvb-usb/cinergyT2-core.c

diff --git a/drivers/media/dvb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/cinergyT2-core.c
rename to drivers/media/usb/dvb-usb/cinergyT2-core.c

drivers/media/usb/dvb-usb/cinergyT2-fe.c

diff --git a/drivers/media/dvb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/cinergyT2-fe.c
rename to drivers/media/usb/dvb-usb/cinergyT2-fe.c

drivers/media/usb/dvb-usb/cinergyT2.h

diff --git a/drivers/media/dvb/dvb-usb/cinergyT2.h b/drivers/media/usb/dvb-usb/cinergyT2.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/cinergyT2.h
rename to drivers/media/usb/dvb-usb/cinergyT2.h

drivers/media/usb/dvb-usb/cxusb.c

diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/cxusb.c
rename to drivers/media/usb/dvb-usb/cxusb.c

drivers/media/usb/dvb-usb/cxusb.h

diff --git a/drivers/media/dvb/dvb-usb/cxusb.h b/drivers/media/usb/dvb-usb/cxusb.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/cxusb.h
rename to drivers/media/usb/dvb-usb/cxusb.h

drivers/media/usb/dvb-usb/dib0700.h

diff --git a/drivers/media/dvb/dvb-usb/dib0700.h b/drivers/media/usb/dvb-usb/dib0700.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dib0700.h
rename to drivers/media/usb/dvb-usb/dib0700.h

drivers/media/usb/dvb-usb/dib0700_core.c

diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/usb/dvb-usb/dib0700_core.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dib0700_core.c
rename to drivers/media/usb/dvb-usb/dib0700_core.c

drivers/media/usb/dvb-usb/dib0700_devices.c

diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dib0700_devices.c
rename to drivers/media/usb/dvb-usb/dib0700_devices.c

drivers/media/usb/dvb-usb/dib07x0.h

diff --git a/drivers/media/dvb/dvb-usb/dib07x0.h b/drivers/media/usb/dvb-usb/dib07x0.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dib07x0.h
rename to drivers/media/usb/dvb-usb/dib07x0.h

drivers/media/usb/dvb-usb/dibusb-common.c

diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/usb/dvb-usb/dibusb-common.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dibusb-common.c
rename to drivers/media/usb/dvb-usb/dibusb-common.c

drivers/media/usb/dvb-usb/dibusb-mb.c

diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/usb/dvb-usb/dibusb-mb.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dibusb-mb.c
rename to drivers/media/usb/dvb-usb/dibusb-mb.c

drivers/media/usb/dvb-usb/dibusb-mc.c

diff --git a/drivers/media/dvb/dvb-usb/dibusb-mc.c b/drivers/media/usb/dvb-usb/dibusb-mc.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dibusb-mc.c
rename to drivers/media/usb/dvb-usb/dibusb-mc.c

drivers/media/usb/dvb-usb/dibusb.h

diff --git a/drivers/media/dvb/dvb-usb/dibusb.h b/drivers/media/usb/dvb-usb/dibusb.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dibusb.h
rename to drivers/media/usb/dvb-usb/dibusb.h

drivers/media/usb/dvb-usb/digitv.c

diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/usb/dvb-usb/digitv.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/digitv.c
rename to drivers/media/usb/dvb-usb/digitv.c

drivers/media/usb/dvb-usb/digitv.h

diff --git a/drivers/media/dvb/dvb-usb/digitv.h b/drivers/media/usb/dvb-usb/digitv.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/digitv.h
rename to drivers/media/usb/dvb-usb/digitv.h

drivers/media/usb/dvb-usb/dtt200u-fe.c

diff --git a/drivers/media/dvb/dvb-usb/dtt200u-fe.c b/drivers/media/usb/dvb-usb/dtt200u-fe.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dtt200u-fe.c
rename to drivers/media/usb/dvb-usb/dtt200u-fe.c

drivers/media/usb/dvb-usb/dtt200u.c

diff --git a/drivers/media/dvb/dvb-usb/dtt200u.c b/drivers/media/usb/dvb-usb/dtt200u.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dtt200u.c
rename to drivers/media/usb/dvb-usb/dtt200u.c

drivers/media/usb/dvb-usb/dtt200u.h

diff --git a/drivers/media/dvb/dvb-usb/dtt200u.h b/drivers/media/usb/dvb-usb/dtt200u.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dtt200u.h
rename to drivers/media/usb/dvb-usb/dtt200u.h

drivers/media/usb/dvb-usb/dtv5100.c

diff --git a/drivers/media/dvb/dvb-usb/dtv5100.c b/drivers/media/usb/dvb-usb/dtv5100.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dtv5100.c
rename to drivers/media/usb/dvb-usb/dtv5100.c

drivers/media/usb/dvb-usb/dtv5100.h

diff --git a/drivers/media/dvb/dvb-usb/dtv5100.h b/drivers/media/usb/dvb-usb/dtv5100.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dtv5100.h
rename to drivers/media/usb/dvb-usb/dtv5100.h

drivers/media/usb/dvb-usb/dvb-usb-common.h

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-common.h b/drivers/media/usb/dvb-usb/dvb-usb-common.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb-usb-common.h
rename to drivers/media/usb/dvb-usb/dvb-usb-common.h

drivers/media/usb/dvb-usb/dvb-usb-dvb.c

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
rename to drivers/media/usb/dvb-usb/dvb-usb-dvb.c

drivers/media/usb/dvb-usb/dvb-usb-firmware.c

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb-usb-firmware.c
rename to drivers/media/usb/dvb-usb/dvb-usb-firmware.c

drivers/media/usb/dvb-usb/dvb-usb-i2c.c

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/usb/dvb-usb/dvb-usb-i2c.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
rename to drivers/media/usb/dvb-usb/dvb-usb-i2c.c

drivers/media/usb/dvb-usb/dvb-usb-init.c

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-init.c b/drivers/media/usb/dvb-usb/dvb-usb-init.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb-usb-init.c
rename to drivers/media/usb/dvb-usb/dvb-usb-init.c

drivers/media/usb/dvb-usb/dvb-usb-remote.c

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/usb/dvb-usb/dvb-usb-remote.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb-usb-remote.c
rename to drivers/media/usb/dvb-usb/dvb-usb-remote.c

drivers/media/usb/dvb-usb/dvb-usb-urb.c

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c b/drivers/media/usb/dvb-usb/dvb-usb-urb.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb-usb-urb.c
rename to drivers/media/usb/dvb-usb/dvb-usb-urb.c

drivers/media/usb/dvb-usb/dvb-usb.h

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/usb/dvb-usb/dvb-usb.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb-usb.h
rename to drivers/media/usb/dvb-usb/dvb-usb.h

drivers/media/usb/dvb-usb/dvb_usb_dvb.c

diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c b/drivers/media/usb/dvb-usb/dvb_usb_dvb.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
rename to drivers/media/usb/dvb-usb/dvb_usb_dvb.c

drivers/media/usb/dvb-usb/dvb_usb_remote.c

diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_remote.c b/drivers/media/usb/dvb-usb/dvb_usb_remote.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dvb_usb_remote.c
rename to drivers/media/usb/dvb-usb/dvb_usb_remote.c

drivers/media/usb/dvb-usb/dw2102.c

diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dw2102.c
rename to drivers/media/usb/dvb-usb/dw2102.c

drivers/media/usb/dvb-usb/dw2102.h

diff --git a/drivers/media/dvb/dvb-usb/dw2102.h b/drivers/media/usb/dvb-usb/dw2102.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/dw2102.h
rename to drivers/media/usb/dvb-usb/dw2102.h

drivers/media/usb/dvb-usb/friio-fe.c

diff --git a/drivers/media/dvb/dvb-usb/friio-fe.c b/drivers/media/usb/dvb-usb/friio-fe.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/friio-fe.c
rename to drivers/media/usb/dvb-usb/friio-fe.c

drivers/media/usb/dvb-usb/friio.c

diff --git a/drivers/media/dvb/dvb-usb/friio.c b/drivers/media/usb/dvb-usb/friio.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/friio.c
rename to drivers/media/usb/dvb-usb/friio.c

drivers/media/usb/dvb-usb/friio.h

diff --git a/drivers/media/dvb/dvb-usb/friio.h b/drivers/media/usb/dvb-usb/friio.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/friio.h
rename to drivers/media/usb/dvb-usb/friio.h

drivers/media/usb/dvb-usb/gp8psk-fe.c

diff --git a/drivers/media/dvb/dvb-usb/gp8psk-fe.c b/drivers/media/usb/dvb-usb/gp8psk-fe.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/gp8psk-fe.c
rename to drivers/media/usb/dvb-usb/gp8psk-fe.c

drivers/media/usb/dvb-usb/gp8psk.c

diff --git a/drivers/media/dvb/dvb-usb/gp8psk.c b/drivers/media/usb/dvb-usb/gp8psk.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/gp8psk.c
rename to drivers/media/usb/dvb-usb/gp8psk.c

drivers/media/usb/dvb-usb/gp8psk.h

diff --git a/drivers/media/dvb/dvb-usb/gp8psk.h b/drivers/media/usb/dvb-usb/gp8psk.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/gp8psk.h
rename to drivers/media/usb/dvb-usb/gp8psk.h

drivers/media/usb/dvb-usb/m920x.c

diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/usb/dvb-usb/m920x.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/m920x.c
rename to drivers/media/usb/dvb-usb/m920x.c

drivers/media/usb/dvb-usb/m920x.h

diff --git a/drivers/media/dvb/dvb-usb/m920x.h b/drivers/media/usb/dvb-usb/m920x.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/m920x.h
rename to drivers/media/usb/dvb-usb/m920x.h

drivers/media/usb/dvb-usb/nova-t-usb2.c

diff --git a/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/drivers/media/usb/dvb-usb/nova-t-usb2.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/nova-t-usb2.c
rename to drivers/media/usb/dvb-usb/nova-t-usb2.c

drivers/media/usb/dvb-usb/opera1.c

diff --git a/drivers/media/dvb/dvb-usb/opera1.c b/drivers/media/usb/dvb-usb/opera1.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/opera1.c
rename to drivers/media/usb/dvb-usb/opera1.c

drivers/media/usb/dvb-usb/pctv452e.c

diff --git a/drivers/media/dvb/dvb-usb/pctv452e.c b/drivers/media/usb/dvb-usb/pctv452e.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/pctv452e.c
rename to drivers/media/usb/dvb-usb/pctv452e.c

drivers/media/usb/dvb-usb/technisat-usb2.c

diff --git a/drivers/media/dvb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/technisat-usb2.c
rename to drivers/media/usb/dvb-usb/technisat-usb2.c

drivers/media/usb/dvb-usb/ttusb2.c

diff --git a/drivers/media/dvb/dvb-usb/ttusb2.c b/drivers/media/usb/dvb-usb/ttusb2.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/ttusb2.c
rename to drivers/media/usb/dvb-usb/ttusb2.c

drivers/media/usb/dvb-usb/ttusb2.h

diff --git a/drivers/media/dvb/dvb-usb/ttusb2.h b/drivers/media/usb/dvb-usb/ttusb2.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/ttusb2.h
rename to drivers/media/usb/dvb-usb/ttusb2.h

drivers/media/usb/dvb-usb/umt-010.c

diff --git a/drivers/media/dvb/dvb-usb/umt-010.c b/drivers/media/usb/dvb-usb/umt-010.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/umt-010.c
rename to drivers/media/usb/dvb-usb/umt-010.c

drivers/media/usb/dvb-usb/usb-urb.c

diff --git a/drivers/media/dvb/dvb-usb/usb-urb.c b/drivers/media/usb/dvb-usb/usb-urb.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/usb-urb.c
rename to drivers/media/usb/dvb-usb/usb-urb.c

drivers/media/usb/dvb-usb/vp702x-fe.c

diff --git a/drivers/media/dvb/dvb-usb/vp702x-fe.c b/drivers/media/usb/dvb-usb/vp702x-fe.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/vp702x-fe.c
rename to drivers/media/usb/dvb-usb/vp702x-fe.c

drivers/media/usb/dvb-usb/vp702x.c

diff --git a/drivers/media/dvb/dvb-usb/vp702x.c b/drivers/media/usb/dvb-usb/vp702x.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/vp702x.c
rename to drivers/media/usb/dvb-usb/vp702x.c

drivers/media/usb/dvb-usb/vp702x.h

diff --git a/drivers/media/dvb/dvb-usb/vp702x.h b/drivers/media/usb/dvb-usb/vp702x.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/vp702x.h
rename to drivers/media/usb/dvb-usb/vp702x.h

drivers/media/usb/dvb-usb/vp7045-fe.c

diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/usb/dvb-usb/vp7045-fe.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/vp7045-fe.c
rename to drivers/media/usb/dvb-usb/vp7045-fe.c

drivers/media/usb/dvb-usb/vp7045.c

diff --git a/drivers/media/dvb/dvb-usb/vp7045.c b/drivers/media/usb/dvb-usb/vp7045.c
similarity index 100%
rename from drivers/media/dvb/dvb-usb/vp7045.c
rename to drivers/media/usb/dvb-usb/vp7045.c

drivers/media/usb/dvb-usb/vp7045.h

diff --git a/drivers/media/dvb/dvb-usb/vp7045.h b/drivers/media/usb/dvb-usb/vp7045.h
similarity index 100%
rename from drivers/media/dvb/dvb-usb/vp7045.h
rename to drivers/media/usb/dvb-usb/vp7045.h

drivers/media/usb/siano/Kconfig

diff --git a/drivers/media/dvb/siano/Kconfig b/drivers/media/usb/siano/Kconfig
similarity index 100%
rename from drivers/media/dvb/siano/Kconfig
rename to drivers/media/usb/siano/Kconfig

drivers/media/usb/siano/Makefile

diff --git a/drivers/media/dvb/siano/Makefile b/drivers/media/usb/siano/Makefile
similarity index 100%
rename from drivers/media/dvb/siano/Makefile
rename to drivers/media/usb/siano/Makefile

drivers/media/usb/siano/sms-cards.c

diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/usb/siano/sms-cards.c
similarity index 100%
rename from drivers/media/dvb/siano/sms-cards.c
rename to drivers/media/usb/siano/sms-cards.c

drivers/media/usb/siano/sms-cards.h

diff --git a/drivers/media/dvb/siano/sms-cards.h b/drivers/media/usb/siano/sms-cards.h
similarity index 100%
rename from drivers/media/dvb/siano/sms-cards.h
rename to drivers/media/usb/siano/sms-cards.h

drivers/media/usb/siano/smscoreapi.c

diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/usb/siano/smscoreapi.c
similarity index 100%
rename from drivers/media/dvb/siano/smscoreapi.c
rename to drivers/media/usb/siano/smscoreapi.c

drivers/media/usb/siano/smscoreapi.h

diff --git a/drivers/media/dvb/siano/smscoreapi.h b/drivers/media/usb/siano/smscoreapi.h
similarity index 100%
rename from drivers/media/dvb/siano/smscoreapi.h
rename to drivers/media/usb/siano/smscoreapi.h

drivers/media/usb/siano/smsdvb.c

diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/usb/siano/smsdvb.c
similarity index 100%
rename from drivers/media/dvb/siano/smsdvb.c
rename to drivers/media/usb/siano/smsdvb.c

drivers/media/usb/siano/smsendian.c

diff --git a/drivers/media/dvb/siano/smsendian.c b/drivers/media/usb/siano/smsendian.c
similarity index 100%
rename from drivers/media/dvb/siano/smsendian.c
rename to drivers/media/usb/siano/smsendian.c

drivers/media/usb/siano/smsendian.h

diff --git a/drivers/media/dvb/siano/smsendian.h b/drivers/media/usb/siano/smsendian.h
similarity index 100%
rename from drivers/media/dvb/siano/smsendian.h
rename to drivers/media/usb/siano/smsendian.h

drivers/media/usb/siano/smsir.c

diff --git a/drivers/media/dvb/siano/smsir.c b/drivers/media/usb/siano/smsir.c
similarity index 100%
rename from drivers/media/dvb/siano/smsir.c
rename to drivers/media/usb/siano/smsir.c

drivers/media/usb/siano/smsir.h

diff --git a/drivers/media/dvb/siano/smsir.h b/drivers/media/usb/siano/smsir.h
similarity index 100%
rename from drivers/media/dvb/siano/smsir.h
rename to drivers/media/usb/siano/smsir.h

drivers/media/usb/siano/smssdio.c

diff --git a/drivers/media/dvb/siano/smssdio.c b/drivers/media/usb/siano/smssdio.c
similarity index 100%
rename from drivers/media/dvb/siano/smssdio.c
rename to drivers/media/usb/siano/smssdio.c

drivers/media/usb/siano/smsusb.c

diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c
similarity index 100%
rename from drivers/media/dvb/siano/smsusb.c
rename to drivers/media/usb/siano/smsusb.c

drivers/media/usb/ttusb-budget/Kconfig

diff --git a/drivers/media/dvb/ttusb-budget/Kconfig b/drivers/media/usb/ttusb-budget/Kconfig
similarity index 100%
rename from drivers/media/dvb/ttusb-budget/Kconfig
rename to drivers/media/usb/ttusb-budget/Kconfig

drivers/media/usb/ttusb-budget/Makefile

diff --git a/drivers/media/dvb/ttusb-budget/Makefile b/drivers/media/usb/ttusb-budget/Makefile
similarity index 100%
rename from drivers/media/dvb/ttusb-budget/Makefile
rename to drivers/media/usb/ttusb-budget/Makefile

drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c

diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
similarity index 100%
rename from drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
rename to drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c

drivers/media/usb/ttusb-dec/Kconfig

diff --git a/drivers/media/dvb/ttusb-dec/Kconfig b/drivers/media/usb/ttusb-dec/Kconfig
similarity index 100%
rename from drivers/media/dvb/ttusb-dec/Kconfig
rename to drivers/media/usb/ttusb-dec/Kconfig

drivers/media/usb/ttusb-dec/Makefile

diff --git a/drivers/media/dvb/ttusb-dec/Makefile b/drivers/media/usb/ttusb-dec/Makefile
similarity index 100%
rename from drivers/media/dvb/ttusb-dec/Makefile
rename to drivers/media/usb/ttusb-dec/Makefile

drivers/media/usb/ttusb-dec/ttusb_dec.c

diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c
similarity index 100%
rename from drivers/media/dvb/ttusb-dec/ttusb_dec.c
rename to drivers/media/usb/ttusb-dec/ttusb_dec.c

drivers/media/usb/ttusb-dec/ttusbdecfe.c

diff --git a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c b/drivers/media/usb/ttusb-dec/ttusbdecfe.c
similarity index 100%
rename from drivers/media/dvb/ttusb-dec/ttusbdecfe.c
rename to drivers/media/usb/ttusb-dec/ttusbdecfe.c

drivers/media/usb/ttusb-dec/ttusbdecfe.h

diff --git a/drivers/media/dvb/ttusb-dec/ttusbdecfe.h b/drivers/media/usb/ttusb-dec/ttusbdecfe.h
similarity index 100%
rename from drivers/media/dvb/ttusb-dec/ttusbdecfe.h
rename to drivers/media/usb/ttusb-dec/ttusbdecfe.h

drivers/media/video/cx231xx/Makefile

diff --git a/drivers/media/video/cx231xx/Makefile b/drivers/media/video/cx231xx/Makefile
index 3ba13f9..9f2d4a9 100644
--- a/drivers/media/video/cx231xx/Makefile
+++ b/drivers/media/video/cx231xx/Makefile
@@ -12,4 +12,4 @@
 ccflags-y += -Idrivers/media/common/tuners
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
-ccflags-y += -Idrivers/media/dvb/dvb-usb
+ccflags-y += -Idrivers/media/usb/dvb-usb

drivers/staging/media/go7007/Makefile

diff --git a/drivers/staging/media/go7007/Makefile b/drivers/staging/media/go7007/Makefile
index f654ddc..3fdbef5 100644
--- a/drivers/staging/media/go7007/Makefile
+++ b/drivers/staging/media/go7007/Makefile
@@ -24,7 +24,7 @@
 #ccflags-$(CONFIG_VIDEO_SAA7134:m=y) += -Idrivers/media/video/saa7134 -DSAA7134_MPEG_GO7007=3
 
 # S2250 needs cypress ezusb loader from dvb-usb
-ccflags-$(CONFIG_VIDEO_GO7007_USB_S2250_BOARD:m=y) += -Idrivers/media/dvb/dvb-usb
+ccflags-$(CONFIG_VIDEO_GO7007_USB_S2250_BOARD:m=y) += -Idrivers/media/usb/dvb-usb
 
 ccflags-y += -Idrivers/media/dvb-frontends
 ccflags-y += -Idrivers/media/dvb-core