---

yaml --- r: 330840 b: refs/heads/master c: 786baec h: refs/heads/master v: v3
git-mirror · Aug 14, 2012 · 1f28923 · 1f28923
1 parent ee816b1
commit 1f28923
Show file tree

Hide file tree

Showing 137 changed files with 30 additions and 18 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 616300bd51bee80d2d122c205866aa4c20adbaa8
+refs/heads/master: 786baecfe78f8e25547c628b48a60fc8e5636056
diff --git a/trunk/Documentation/dvb/README.dvb-usb b/trunk/Documentation/dvb/README.dvb-usb
@@ -30,7 +30,7 @@ with the device via the bus. The connection between the DVB-API-functionality
 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

diff --git a/trunk/drivers/media/Kconfig b/trunk/drivers/media/Kconfig
@@ -163,6 +163,7 @@ source "drivers/media/radio/Kconfig"
 
 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

diff --git a/trunk/drivers/media/Makefile b/trunk/drivers/media/Makefile
@@ -11,5 +11,5 @@ endif
 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/
diff --git a/trunk/drivers/media/dvb/Kconfig b/trunk/drivers/media/dvb/Kconfig
@@ -15,14 +15,6 @@ comment "Supported SAA7146 based PCI Adapters"
 	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"

diff --git a/trunk/drivers/media/dvb/Makefile b/trunk/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/		\

diff --git a/trunk/drivers/media/usb/Kconfig b/trunk/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
diff --git a/trunk/drivers/media/usb/Makefile b/trunk/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/
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/Kconfig → trunk/drivers/media/usb/dvb-usb-v2/Kconfig b/trunk/drivers/media/dvb/dvb-usb-v2/Kconfig → trunk/drivers/media/usb/dvb-usb-v2/Kconfig
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/Makefile → trunk/drivers/media/usb/dvb-usb-v2/Makefile b/trunk/drivers/media/dvb/dvb-usb-v2/Makefile → trunk/drivers/media/usb/dvb-usb-v2/Makefile
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/af9015.c → trunk/drivers/media/usb/dvb-usb-v2/af9015.c b/trunk/drivers/media/dvb/dvb-usb-v2/af9015.c → trunk/drivers/media/usb/dvb-usb-v2/af9015.c
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/af9015.h → trunk/drivers/media/usb/dvb-usb-v2/af9015.h b/trunk/drivers/media/dvb/dvb-usb-v2/af9015.h → trunk/drivers/media/usb/dvb-usb-v2/af9015.h
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/af9035.c → trunk/drivers/media/usb/dvb-usb-v2/af9035.c b/trunk/drivers/media/dvb/dvb-usb-v2/af9035.c → trunk/drivers/media/usb/dvb-usb-v2/af9035.c
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/af9035.h → trunk/drivers/media/usb/dvb-usb-v2/af9035.h b/trunk/drivers/media/dvb/dvb-usb-v2/af9035.h → trunk/drivers/media/usb/dvb-usb-v2/af9035.h
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/anysee.c → trunk/drivers/media/usb/dvb-usb-v2/anysee.c b/trunk/drivers/media/dvb/dvb-usb-v2/anysee.c → trunk/drivers/media/usb/dvb-usb-v2/anysee.c
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/anysee.h → trunk/drivers/media/usb/dvb-usb-v2/anysee.h b/trunk/drivers/media/dvb/dvb-usb-v2/anysee.h → trunk/drivers/media/usb/dvb-usb-v2/anysee.h
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/au6610.c → trunk/drivers/media/usb/dvb-usb-v2/au6610.c b/trunk/drivers/media/dvb/dvb-usb-v2/au6610.c → trunk/drivers/media/usb/dvb-usb-v2/au6610.c
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/au6610.h → trunk/drivers/media/usb/dvb-usb-v2/au6610.h b/trunk/drivers/media/dvb/dvb-usb-v2/au6610.h → trunk/drivers/media/usb/dvb-usb-v2/au6610.h
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/az6007.c → trunk/drivers/media/usb/dvb-usb-v2/az6007.c b/trunk/drivers/media/dvb/dvb-usb-v2/az6007.c → trunk/drivers/media/usb/dvb-usb-v2/az6007.c
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/ce6230.c → trunk/drivers/media/usb/dvb-usb-v2/ce6230.c b/trunk/drivers/media/dvb/dvb-usb-v2/ce6230.c → trunk/drivers/media/usb/dvb-usb-v2/ce6230.c
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/ce6230.h → trunk/drivers/media/usb/dvb-usb-v2/ce6230.h b/trunk/drivers/media/dvb/dvb-usb-v2/ce6230.h → trunk/drivers/media/usb/dvb-usb-v2/ce6230.h
diff --git a/...s/media/dvb/dvb-usb-v2/cypress_firmware.c → ...s/media/usb/dvb-usb-v2/cypress_firmware.c b/...s/media/dvb/dvb-usb-v2/cypress_firmware.c → ...s/media/usb/dvb-usb-v2/cypress_firmware.c
diff --git a/...s/media/dvb/dvb-usb-v2/cypress_firmware.h → ...s/media/usb/dvb-usb-v2/cypress_firmware.h b/...s/media/dvb/dvb-usb-v2/cypress_firmware.h → ...s/media/usb/dvb-usb-v2/cypress_firmware.h
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/dvb_usb.h → trunk/drivers/media/usb/dvb-usb-v2/dvb_usb.h b/trunk/drivers/media/dvb/dvb-usb-v2/dvb_usb.h → trunk/drivers/media/usb/dvb-usb-v2/dvb_usb.h
diff --git a/...ers/media/dvb/dvb-usb-v2/dvb_usb_common.h → ...ers/media/usb/dvb-usb-v2/dvb_usb_common.h b/...ers/media/dvb/dvb-usb-v2/dvb_usb_common.h → ...ers/media/usb/dvb-usb-v2/dvb_usb_common.h
diff --git a/...ivers/media/dvb/dvb-usb-v2/dvb_usb_core.c → ...ivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/...ivers/media/dvb/dvb-usb-v2/dvb_usb_core.c → ...ivers/media/usb/dvb-usb-v2/dvb_usb_core.c
diff --git a/...rivers/media/dvb/dvb-usb-v2/dvb_usb_urb.c → ...rivers/media/usb/dvb-usb-v2/dvb_usb_urb.c b/...rivers/media/dvb/dvb-usb-v2/dvb_usb_urb.c → ...rivers/media/usb/dvb-usb-v2/dvb_usb_urb.c
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/ec168.c → trunk/drivers/media/usb/dvb-usb-v2/ec168.c b/trunk/drivers/media/dvb/dvb-usb-v2/ec168.c → trunk/drivers/media/usb/dvb-usb-v2/ec168.c
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/ec168.h → trunk/drivers/media/usb/dvb-usb-v2/ec168.h b/trunk/drivers/media/dvb/dvb-usb-v2/ec168.h → trunk/drivers/media/usb/dvb-usb-v2/ec168.h
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/gl861.c → trunk/drivers/media/usb/dvb-usb-v2/gl861.c b/trunk/drivers/media/dvb/dvb-usb-v2/gl861.c → trunk/drivers/media/usb/dvb-usb-v2/gl861.c
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/gl861.h → trunk/drivers/media/usb/dvb-usb-v2/gl861.h b/trunk/drivers/media/dvb/dvb-usb-v2/gl861.h → trunk/drivers/media/usb/dvb-usb-v2/gl861.h
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/it913x.c → trunk/drivers/media/usb/dvb-usb-v2/it913x.c b/trunk/drivers/media/dvb/dvb-usb-v2/it913x.c → trunk/drivers/media/usb/dvb-usb-v2/it913x.c
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/lmedm04.c → trunk/drivers/media/usb/dvb-usb-v2/lmedm04.c b/trunk/drivers/media/dvb/dvb-usb-v2/lmedm04.c → trunk/drivers/media/usb/dvb-usb-v2/lmedm04.c
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/lmedm04.h → trunk/drivers/media/usb/dvb-usb-v2/lmedm04.h b/trunk/drivers/media/dvb/dvb-usb-v2/lmedm04.h → trunk/drivers/media/usb/dvb-usb-v2/lmedm04.h
diff --git a/...ers/media/dvb/dvb-usb-v2/mxl111sf-demod.c → ...ers/media/usb/dvb-usb-v2/mxl111sf-demod.c b/...ers/media/dvb/dvb-usb-v2/mxl111sf-demod.c → ...ers/media/usb/dvb-usb-v2/mxl111sf-demod.c
diff --git a/...ers/media/dvb/dvb-usb-v2/mxl111sf-demod.h → ...ers/media/usb/dvb-usb-v2/mxl111sf-demod.h b/...ers/media/dvb/dvb-usb-v2/mxl111sf-demod.h → ...ers/media/usb/dvb-usb-v2/mxl111sf-demod.h
diff --git a/...vers/media/dvb/dvb-usb-v2/mxl111sf-gpio.c → ...vers/media/usb/dvb-usb-v2/mxl111sf-gpio.c b/...vers/media/dvb/dvb-usb-v2/mxl111sf-gpio.c → ...vers/media/usb/dvb-usb-v2/mxl111sf-gpio.c
diff --git a/...vers/media/dvb/dvb-usb-v2/mxl111sf-gpio.h → ...vers/media/usb/dvb-usb-v2/mxl111sf-gpio.h b/...vers/media/dvb/dvb-usb-v2/mxl111sf-gpio.h → ...vers/media/usb/dvb-usb-v2/mxl111sf-gpio.h
diff --git a/...ivers/media/dvb/dvb-usb-v2/mxl111sf-i2c.c → ...ivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c b/...ivers/media/dvb/dvb-usb-v2/mxl111sf-i2c.c → ...ivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c
diff --git a/...ivers/media/dvb/dvb-usb-v2/mxl111sf-i2c.h → ...ivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h b/...ivers/media/dvb/dvb-usb-v2/mxl111sf-i2c.h → ...ivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h
diff --git a/...ivers/media/dvb/dvb-usb-v2/mxl111sf-phy.c → ...ivers/media/usb/dvb-usb-v2/mxl111sf-phy.c b/...ivers/media/dvb/dvb-usb-v2/mxl111sf-phy.c → ...ivers/media/usb/dvb-usb-v2/mxl111sf-phy.c
diff --git a/...ivers/media/dvb/dvb-usb-v2/mxl111sf-phy.h → ...ivers/media/usb/dvb-usb-v2/mxl111sf-phy.h b/...ivers/media/dvb/dvb-usb-v2/mxl111sf-phy.h → ...ivers/media/usb/dvb-usb-v2/mxl111sf-phy.h
diff --git a/...ivers/media/dvb/dvb-usb-v2/mxl111sf-reg.h → ...ivers/media/usb/dvb-usb-v2/mxl111sf-reg.h b/...ivers/media/dvb/dvb-usb-v2/mxl111sf-reg.h → ...ivers/media/usb/dvb-usb-v2/mxl111sf-reg.h
diff --git a/...ers/media/dvb/dvb-usb-v2/mxl111sf-tuner.c → ...ers/media/usb/dvb-usb-v2/mxl111sf-tuner.c b/...ers/media/dvb/dvb-usb-v2/mxl111sf-tuner.c → ...ers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
diff --git a/...ers/media/dvb/dvb-usb-v2/mxl111sf-tuner.h → ...ers/media/usb/dvb-usb-v2/mxl111sf-tuner.h b/...ers/media/dvb/dvb-usb-v2/mxl111sf-tuner.h → ...ers/media/usb/dvb-usb-v2/mxl111sf-tuner.h
diff --git a/...k/drivers/media/dvb/dvb-usb-v2/mxl111sf.c → ...k/drivers/media/usb/dvb-usb-v2/mxl111sf.c b/...k/drivers/media/dvb/dvb-usb-v2/mxl111sf.c → ...k/drivers/media/usb/dvb-usb-v2/mxl111sf.c
diff --git a/...k/drivers/media/dvb/dvb-usb-v2/mxl111sf.h → ...k/drivers/media/usb/dvb-usb-v2/mxl111sf.h b/...k/drivers/media/dvb/dvb-usb-v2/mxl111sf.h → ...k/drivers/media/usb/dvb-usb-v2/mxl111sf.h
diff --git a/...k/drivers/media/dvb/dvb-usb-v2/rtl28xxu.c → ...k/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/...k/drivers/media/dvb/dvb-usb-v2/rtl28xxu.c → ...k/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
diff --git a/...k/drivers/media/dvb/dvb-usb-v2/rtl28xxu.h → ...k/drivers/media/usb/dvb-usb-v2/rtl28xxu.h b/...k/drivers/media/dvb/dvb-usb-v2/rtl28xxu.h → ...k/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/usb_urb.c → trunk/drivers/media/usb/dvb-usb-v2/usb_urb.c b/trunk/drivers/media/dvb/dvb-usb-v2/usb_urb.c → trunk/drivers/media/usb/dvb-usb-v2/usb_urb.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/Kconfig → trunk/drivers/media/usb/dvb-usb/Kconfig b/trunk/drivers/media/dvb/dvb-usb/Kconfig → trunk/drivers/media/usb/dvb-usb/Kconfig
diff --git a/trunk/drivers/media/dvb/dvb-usb/Makefile → trunk/drivers/media/usb/dvb-usb/Makefile b/trunk/drivers/media/dvb/dvb-usb/Makefile → trunk/drivers/media/usb/dvb-usb/Makefile
diff --git a/trunk/drivers/media/dvb/dvb-usb/a800.c → trunk/drivers/media/usb/dvb-usb/a800.c b/trunk/drivers/media/dvb/dvb-usb/a800.c → trunk/drivers/media/usb/dvb-usb/a800.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/af9005-fe.c → trunk/drivers/media/usb/dvb-usb/af9005-fe.c b/trunk/drivers/media/dvb/dvb-usb/af9005-fe.c → trunk/drivers/media/usb/dvb-usb/af9005-fe.c
diff --git a/...drivers/media/dvb/dvb-usb/af9005-remote.c → ...drivers/media/usb/dvb-usb/af9005-remote.c b/...drivers/media/dvb/dvb-usb/af9005-remote.c → ...drivers/media/usb/dvb-usb/af9005-remote.c
diff --git a/...drivers/media/dvb/dvb-usb/af9005-script.h → ...drivers/media/usb/dvb-usb/af9005-script.h b/...drivers/media/dvb/dvb-usb/af9005-script.h → ...drivers/media/usb/dvb-usb/af9005-script.h
diff --git a/trunk/drivers/media/dvb/dvb-usb/af9005.c → trunk/drivers/media/usb/dvb-usb/af9005.c b/trunk/drivers/media/dvb/dvb-usb/af9005.c → trunk/drivers/media/usb/dvb-usb/af9005.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/af9005.h → trunk/drivers/media/usb/dvb-usb/af9005.h b/trunk/drivers/media/dvb/dvb-usb/af9005.h → trunk/drivers/media/usb/dvb-usb/af9005.h
diff --git a/trunk/drivers/media/dvb/dvb-usb/az6027.c → trunk/drivers/media/usb/dvb-usb/az6027.c b/trunk/drivers/media/dvb/dvb-usb/az6027.c → trunk/drivers/media/usb/dvb-usb/az6027.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/az6027.h → trunk/drivers/media/usb/dvb-usb/az6027.h b/trunk/drivers/media/dvb/dvb-usb/az6027.h → trunk/drivers/media/usb/dvb-usb/az6027.h
diff --git a/...rivers/media/dvb/dvb-usb/cinergyT2-core.c → ...rivers/media/usb/dvb-usb/cinergyT2-core.c b/...rivers/media/dvb/dvb-usb/cinergyT2-core.c → ...rivers/media/usb/dvb-usb/cinergyT2-core.c
diff --git a/.../drivers/media/dvb/dvb-usb/cinergyT2-fe.c → .../drivers/media/usb/dvb-usb/cinergyT2-fe.c b/.../drivers/media/dvb/dvb-usb/cinergyT2-fe.c → .../drivers/media/usb/dvb-usb/cinergyT2-fe.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/cinergyT2.h → trunk/drivers/media/usb/dvb-usb/cinergyT2.h b/trunk/drivers/media/dvb/dvb-usb/cinergyT2.h → trunk/drivers/media/usb/dvb-usb/cinergyT2.h
diff --git a/trunk/drivers/media/dvb/dvb-usb/cxusb.c → trunk/drivers/media/usb/dvb-usb/cxusb.c b/trunk/drivers/media/dvb/dvb-usb/cxusb.c → trunk/drivers/media/usb/dvb-usb/cxusb.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/cxusb.h → trunk/drivers/media/usb/dvb-usb/cxusb.h b/trunk/drivers/media/dvb/dvb-usb/cxusb.h → trunk/drivers/media/usb/dvb-usb/cxusb.h
diff --git a/trunk/drivers/media/dvb/dvb-usb/dib0700.h → trunk/drivers/media/usb/dvb-usb/dib0700.h b/trunk/drivers/media/dvb/dvb-usb/dib0700.h → trunk/drivers/media/usb/dvb-usb/dib0700.h
diff --git a/.../drivers/media/dvb/dvb-usb/dib0700_core.c → .../drivers/media/usb/dvb-usb/dib0700_core.c b/.../drivers/media/dvb/dvb-usb/dib0700_core.c → .../drivers/media/usb/dvb-usb/dib0700_core.c
diff --git a/...ivers/media/dvb/dvb-usb/dib0700_devices.c → ...ivers/media/usb/dvb-usb/dib0700_devices.c b/...ivers/media/dvb/dvb-usb/dib0700_devices.c → ...ivers/media/usb/dvb-usb/dib0700_devices.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/dib07x0.h → trunk/drivers/media/usb/dvb-usb/dib07x0.h b/trunk/drivers/media/dvb/dvb-usb/dib07x0.h → trunk/drivers/media/usb/dvb-usb/dib07x0.h
diff --git a/...drivers/media/dvb/dvb-usb/dibusb-common.c → ...drivers/media/usb/dvb-usb/dibusb-common.c b/...drivers/media/dvb/dvb-usb/dibusb-common.c → ...drivers/media/usb/dvb-usb/dibusb-common.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/dibusb-mb.c → trunk/drivers/media/usb/dvb-usb/dibusb-mb.c b/trunk/drivers/media/dvb/dvb-usb/dibusb-mb.c → trunk/drivers/media/usb/dvb-usb/dibusb-mb.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/dibusb-mc.c → trunk/drivers/media/usb/dvb-usb/dibusb-mc.c b/trunk/drivers/media/dvb/dvb-usb/dibusb-mc.c → trunk/drivers/media/usb/dvb-usb/dibusb-mc.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/dibusb.h → trunk/drivers/media/usb/dvb-usb/dibusb.h b/trunk/drivers/media/dvb/dvb-usb/dibusb.h → trunk/drivers/media/usb/dvb-usb/dibusb.h
diff --git a/trunk/drivers/media/dvb/dvb-usb/digitv.c → trunk/drivers/media/usb/dvb-usb/digitv.c b/trunk/drivers/media/dvb/dvb-usb/digitv.c → trunk/drivers/media/usb/dvb-usb/digitv.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/digitv.h → trunk/drivers/media/usb/dvb-usb/digitv.h b/trunk/drivers/media/dvb/dvb-usb/digitv.h → trunk/drivers/media/usb/dvb-usb/digitv.h
diff --git a/trunk/drivers/media/dvb/dvb-usb/dtt200u-fe.c → trunk/drivers/media/usb/dvb-usb/dtt200u-fe.c b/trunk/drivers/media/dvb/dvb-usb/dtt200u-fe.c → trunk/drivers/media/usb/dvb-usb/dtt200u-fe.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/dtt200u.c → trunk/drivers/media/usb/dvb-usb/dtt200u.c b/trunk/drivers/media/dvb/dvb-usb/dtt200u.c → trunk/drivers/media/usb/dvb-usb/dtt200u.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/dtt200u.h → trunk/drivers/media/usb/dvb-usb/dtt200u.h b/trunk/drivers/media/dvb/dvb-usb/dtt200u.h → trunk/drivers/media/usb/dvb-usb/dtt200u.h
diff --git a/trunk/drivers/media/dvb/dvb-usb/dtv5100.c → trunk/drivers/media/usb/dvb-usb/dtv5100.c b/trunk/drivers/media/dvb/dvb-usb/dtv5100.c → trunk/drivers/media/usb/dvb-usb/dtv5100.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/dtv5100.h → trunk/drivers/media/usb/dvb-usb/dtv5100.h b/trunk/drivers/media/dvb/dvb-usb/dtv5100.h → trunk/drivers/media/usb/dvb-usb/dtv5100.h
diff --git a/...rivers/media/dvb/dvb-usb/dvb-usb-common.h → ...rivers/media/usb/dvb-usb/dvb-usb-common.h b/...rivers/media/dvb/dvb-usb/dvb-usb-common.h → ...rivers/media/usb/dvb-usb/dvb-usb-common.h
diff --git a/...k/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c → ...k/drivers/media/usb/dvb-usb/dvb-usb-dvb.c b/...k/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c → ...k/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
diff --git a/...vers/media/dvb/dvb-usb/dvb-usb-firmware.c → ...vers/media/usb/dvb-usb/dvb-usb-firmware.c b/...vers/media/dvb/dvb-usb/dvb-usb-firmware.c → ...vers/media/usb/dvb-usb/dvb-usb-firmware.c
diff --git a/...k/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c → ...k/drivers/media/usb/dvb-usb/dvb-usb-i2c.c b/...k/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c → ...k/drivers/media/usb/dvb-usb/dvb-usb-i2c.c
diff --git a/.../drivers/media/dvb/dvb-usb/dvb-usb-init.c → .../drivers/media/usb/dvb-usb/dvb-usb-init.c b/.../drivers/media/dvb/dvb-usb/dvb-usb-init.c → .../drivers/media/usb/dvb-usb/dvb-usb-init.c
diff --git a/...rivers/media/dvb/dvb-usb/dvb-usb-remote.c → ...rivers/media/usb/dvb-usb/dvb-usb-remote.c b/...rivers/media/dvb/dvb-usb/dvb-usb-remote.c → ...rivers/media/usb/dvb-usb/dvb-usb-remote.c
diff --git a/...k/drivers/media/dvb/dvb-usb/dvb-usb-urb.c → ...k/drivers/media/usb/dvb-usb/dvb-usb-urb.c b/...k/drivers/media/dvb/dvb-usb/dvb-usb-urb.c → ...k/drivers/media/usb/dvb-usb/dvb-usb-urb.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb-usb.h → trunk/drivers/media/usb/dvb-usb/dvb-usb.h b/trunk/drivers/media/dvb/dvb-usb/dvb-usb.h → trunk/drivers/media/usb/dvb-usb/dvb-usb.h
diff --git a/...k/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c → ...k/drivers/media/usb/dvb-usb/dvb_usb_dvb.c b/...k/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c → ...k/drivers/media/usb/dvb-usb/dvb_usb_dvb.c
diff --git a/...rivers/media/dvb/dvb-usb/dvb_usb_remote.c → ...rivers/media/usb/dvb-usb/dvb_usb_remote.c b/...rivers/media/dvb/dvb-usb/dvb_usb_remote.c → ...rivers/media/usb/dvb-usb/dvb_usb_remote.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/dw2102.c → trunk/drivers/media/usb/dvb-usb/dw2102.c b/trunk/drivers/media/dvb/dvb-usb/dw2102.c → trunk/drivers/media/usb/dvb-usb/dw2102.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/dw2102.h → trunk/drivers/media/usb/dvb-usb/dw2102.h b/trunk/drivers/media/dvb/dvb-usb/dw2102.h → trunk/drivers/media/usb/dvb-usb/dw2102.h
diff --git a/trunk/drivers/media/dvb/dvb-usb/friio-fe.c → trunk/drivers/media/usb/dvb-usb/friio-fe.c b/trunk/drivers/media/dvb/dvb-usb/friio-fe.c → trunk/drivers/media/usb/dvb-usb/friio-fe.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/friio.c → trunk/drivers/media/usb/dvb-usb/friio.c b/trunk/drivers/media/dvb/dvb-usb/friio.c → trunk/drivers/media/usb/dvb-usb/friio.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/friio.h → trunk/drivers/media/usb/dvb-usb/friio.h b/trunk/drivers/media/dvb/dvb-usb/friio.h → trunk/drivers/media/usb/dvb-usb/friio.h
diff --git a/trunk/drivers/media/dvb/dvb-usb/gp8psk-fe.c → trunk/drivers/media/usb/dvb-usb/gp8psk-fe.c b/trunk/drivers/media/dvb/dvb-usb/gp8psk-fe.c → trunk/drivers/media/usb/dvb-usb/gp8psk-fe.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/gp8psk.c → trunk/drivers/media/usb/dvb-usb/gp8psk.c b/trunk/drivers/media/dvb/dvb-usb/gp8psk.c → trunk/drivers/media/usb/dvb-usb/gp8psk.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/gp8psk.h → trunk/drivers/media/usb/dvb-usb/gp8psk.h b/trunk/drivers/media/dvb/dvb-usb/gp8psk.h → trunk/drivers/media/usb/dvb-usb/gp8psk.h
diff --git a/trunk/drivers/media/dvb/dvb-usb/m920x.c → trunk/drivers/media/usb/dvb-usb/m920x.c b/trunk/drivers/media/dvb/dvb-usb/m920x.c → trunk/drivers/media/usb/dvb-usb/m920x.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/m920x.h → trunk/drivers/media/usb/dvb-usb/m920x.h b/trunk/drivers/media/dvb/dvb-usb/m920x.h → trunk/drivers/media/usb/dvb-usb/m920x.h
diff --git a/...k/drivers/media/dvb/dvb-usb/nova-t-usb2.c → ...k/drivers/media/usb/dvb-usb/nova-t-usb2.c b/...k/drivers/media/dvb/dvb-usb/nova-t-usb2.c → ...k/drivers/media/usb/dvb-usb/nova-t-usb2.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/opera1.c → trunk/drivers/media/usb/dvb-usb/opera1.c b/trunk/drivers/media/dvb/dvb-usb/opera1.c → trunk/drivers/media/usb/dvb-usb/opera1.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/pctv452e.c → trunk/drivers/media/usb/dvb-usb/pctv452e.c b/trunk/drivers/media/dvb/dvb-usb/pctv452e.c → trunk/drivers/media/usb/dvb-usb/pctv452e.c
diff --git a/...rivers/media/dvb/dvb-usb/technisat-usb2.c → ...rivers/media/usb/dvb-usb/technisat-usb2.c b/...rivers/media/dvb/dvb-usb/technisat-usb2.c → ...rivers/media/usb/dvb-usb/technisat-usb2.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/ttusb2.c → trunk/drivers/media/usb/dvb-usb/ttusb2.c b/trunk/drivers/media/dvb/dvb-usb/ttusb2.c → trunk/drivers/media/usb/dvb-usb/ttusb2.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/ttusb2.h → trunk/drivers/media/usb/dvb-usb/ttusb2.h b/trunk/drivers/media/dvb/dvb-usb/ttusb2.h → trunk/drivers/media/usb/dvb-usb/ttusb2.h
diff --git a/trunk/drivers/media/dvb/dvb-usb/umt-010.c → trunk/drivers/media/usb/dvb-usb/umt-010.c b/trunk/drivers/media/dvb/dvb-usb/umt-010.c → trunk/drivers/media/usb/dvb-usb/umt-010.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/usb-urb.c → trunk/drivers/media/usb/dvb-usb/usb-urb.c b/trunk/drivers/media/dvb/dvb-usb/usb-urb.c → trunk/drivers/media/usb/dvb-usb/usb-urb.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/vp702x-fe.c → trunk/drivers/media/usb/dvb-usb/vp702x-fe.c b/trunk/drivers/media/dvb/dvb-usb/vp702x-fe.c → trunk/drivers/media/usb/dvb-usb/vp702x-fe.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/vp702x.c → trunk/drivers/media/usb/dvb-usb/vp702x.c b/trunk/drivers/media/dvb/dvb-usb/vp702x.c → trunk/drivers/media/usb/dvb-usb/vp702x.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/vp702x.h → trunk/drivers/media/usb/dvb-usb/vp702x.h b/trunk/drivers/media/dvb/dvb-usb/vp702x.h → trunk/drivers/media/usb/dvb-usb/vp702x.h
diff --git a/trunk/drivers/media/dvb/dvb-usb/vp7045-fe.c → trunk/drivers/media/usb/dvb-usb/vp7045-fe.c b/trunk/drivers/media/dvb/dvb-usb/vp7045-fe.c → trunk/drivers/media/usb/dvb-usb/vp7045-fe.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/vp7045.c → trunk/drivers/media/usb/dvb-usb/vp7045.c b/trunk/drivers/media/dvb/dvb-usb/vp7045.c → trunk/drivers/media/usb/dvb-usb/vp7045.c
diff --git a/trunk/drivers/media/dvb/dvb-usb/vp7045.h → trunk/drivers/media/usb/dvb-usb/vp7045.h b/trunk/drivers/media/dvb/dvb-usb/vp7045.h → trunk/drivers/media/usb/dvb-usb/vp7045.h
diff --git a/trunk/drivers/media/dvb/siano/Kconfig → trunk/drivers/media/usb/siano/Kconfig b/trunk/drivers/media/dvb/siano/Kconfig → trunk/drivers/media/usb/siano/Kconfig
diff --git a/trunk/drivers/media/dvb/siano/Makefile → trunk/drivers/media/usb/siano/Makefile b/trunk/drivers/media/dvb/siano/Makefile → trunk/drivers/media/usb/siano/Makefile
diff --git a/trunk/drivers/media/dvb/siano/sms-cards.c → trunk/drivers/media/usb/siano/sms-cards.c b/trunk/drivers/media/dvb/siano/sms-cards.c → trunk/drivers/media/usb/siano/sms-cards.c
diff --git a/trunk/drivers/media/dvb/siano/sms-cards.h → trunk/drivers/media/usb/siano/sms-cards.h b/trunk/drivers/media/dvb/siano/sms-cards.h → trunk/drivers/media/usb/siano/sms-cards.h
diff --git a/trunk/drivers/media/dvb/siano/smscoreapi.c → trunk/drivers/media/usb/siano/smscoreapi.c b/trunk/drivers/media/dvb/siano/smscoreapi.c → trunk/drivers/media/usb/siano/smscoreapi.c
diff --git a/trunk/drivers/media/dvb/siano/smscoreapi.h → trunk/drivers/media/usb/siano/smscoreapi.h b/trunk/drivers/media/dvb/siano/smscoreapi.h → trunk/drivers/media/usb/siano/smscoreapi.h
diff --git a/trunk/drivers/media/dvb/siano/smsdvb.c → trunk/drivers/media/usb/siano/smsdvb.c b/trunk/drivers/media/dvb/siano/smsdvb.c → trunk/drivers/media/usb/siano/smsdvb.c
diff --git a/trunk/drivers/media/dvb/siano/smsendian.c → trunk/drivers/media/usb/siano/smsendian.c b/trunk/drivers/media/dvb/siano/smsendian.c → trunk/drivers/media/usb/siano/smsendian.c
diff --git a/trunk/drivers/media/dvb/siano/smsendian.h → trunk/drivers/media/usb/siano/smsendian.h b/trunk/drivers/media/dvb/siano/smsendian.h → trunk/drivers/media/usb/siano/smsendian.h
diff --git a/trunk/drivers/media/dvb/siano/smsir.c → trunk/drivers/media/usb/siano/smsir.c b/trunk/drivers/media/dvb/siano/smsir.c → trunk/drivers/media/usb/siano/smsir.c
diff --git a/trunk/drivers/media/dvb/siano/smsir.h → trunk/drivers/media/usb/siano/smsir.h b/trunk/drivers/media/dvb/siano/smsir.h → trunk/drivers/media/usb/siano/smsir.h
diff --git a/trunk/drivers/media/dvb/siano/smssdio.c → trunk/drivers/media/usb/siano/smssdio.c b/trunk/drivers/media/dvb/siano/smssdio.c → trunk/drivers/media/usb/siano/smssdio.c
diff --git a/trunk/drivers/media/dvb/siano/smsusb.c → trunk/drivers/media/usb/siano/smsusb.c b/trunk/drivers/media/dvb/siano/smsusb.c → trunk/drivers/media/usb/siano/smsusb.c
diff --git a/trunk/drivers/media/dvb/ttusb-budget/Kconfig → trunk/drivers/media/usb/ttusb-budget/Kconfig b/trunk/drivers/media/dvb/ttusb-budget/Kconfig → trunk/drivers/media/usb/ttusb-budget/Kconfig
diff --git a/...k/drivers/media/dvb/ttusb-budget/Makefile → ...k/drivers/media/usb/ttusb-budget/Makefile b/...k/drivers/media/dvb/ttusb-budget/Makefile → ...k/drivers/media/usb/ttusb-budget/Makefile
diff --git a/...media/dvb/ttusb-budget/dvb-ttusb-budget.c → ...media/usb/ttusb-budget/dvb-ttusb-budget.c b/...media/dvb/ttusb-budget/dvb-ttusb-budget.c → ...media/usb/ttusb-budget/dvb-ttusb-budget.c
diff --git a/trunk/drivers/media/dvb/ttusb-dec/Kconfig → trunk/drivers/media/usb/ttusb-dec/Kconfig b/trunk/drivers/media/dvb/ttusb-dec/Kconfig → trunk/drivers/media/usb/ttusb-dec/Kconfig
diff --git a/trunk/drivers/media/dvb/ttusb-dec/Makefile → trunk/drivers/media/usb/ttusb-dec/Makefile b/trunk/drivers/media/dvb/ttusb-dec/Makefile → trunk/drivers/media/usb/ttusb-dec/Makefile
diff --git a/...k/drivers/media/dvb/ttusb-dec/ttusb_dec.c → ...k/drivers/media/usb/ttusb-dec/ttusb_dec.c b/...k/drivers/media/dvb/ttusb-dec/ttusb_dec.c → ...k/drivers/media/usb/ttusb-dec/ttusb_dec.c
diff --git a/.../drivers/media/dvb/ttusb-dec/ttusbdecfe.c → .../drivers/media/usb/ttusb-dec/ttusbdecfe.c b/.../drivers/media/dvb/ttusb-dec/ttusbdecfe.c → .../drivers/media/usb/ttusb-dec/ttusbdecfe.c
diff --git a/.../drivers/media/dvb/ttusb-dec/ttusbdecfe.h → .../drivers/media/usb/ttusb-dec/ttusbdecfe.h b/.../drivers/media/dvb/ttusb-dec/ttusbdecfe.h → .../drivers/media/usb/ttusb-dec/ttusbdecfe.h
diff --git a/trunk/drivers/media/video/cx231xx/Makefile b/trunk/drivers/media/video/cx231xx/Makefile
@@ -12,4 +12,4 @@ ccflags-y += -Idrivers/media/video
 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
diff --git a/trunk/drivers/staging/media/go7007/Makefile b/trunk/drivers/staging/media/go7007/Makefile
@@ -24,7 +24,7 @@ s2250-y := s2250-board.o
 #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