usb: don't enter usb subdirectories directly

Instead, make we enter usb/ directory on all
needed cases and enter the subdirectories from
drivers/usb/Makefile.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 7 insertions, 4 deletions

diff --git a/drivers/Makefile b/drivers/Makefile
index ad67b7d4c271..0cf73a90fca8 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -64,12 +64,10 @@ obj-$(CONFIG_ATA_OVER_ETH)	+= block/aoe/
 obj-$(CONFIG_PARIDE)            += block/paride/
 obj-$(CONFIG_TC)                += tc/
 obj-$(CONFIG_UWB)               += uwb/
-obj-$(CONFIG_USB_OTG_UTILS)     += usb/otg/
+obj-$(CONFIG_USB_OTG_UTILS)     += usb/
 obj-$(CONFIG_USB)               += usb/
-obj-$(CONFIG_USB_MUSB_HDRC)     += usb/musb/
-obj-$(CONFIG_USB_RENESAS_USBHS) += usb/renesas_usbhs/
 obj-$(CONFIG_PCI)               += usb/
-obj-$(CONFIG_USB_GADGET)        += usb/gadget/
+obj-$(CONFIG_USB_GADGET)        += usb/
 obj-$(CONFIG_SERIO)             += input/serio/
 obj-$(CONFIG_GAMEPORT)          += input/gameport/
 obj-$(CONFIG_INPUT)             += input/
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 239f050efa35..9bc8aeb3c96f 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -45,3 +45,8 @@ obj-$(CONFIG_EARLY_PRINTK_DBGP)	+= early/
 
 obj-$(CONFIG_USB_ATM)           += atm/
 obj-$(CONFIG_USB_SPEEDTOUCH)    += atm/
+
+obj-$(CONFIG_USB_MUSB_HDRC)     += musb/
+obj-$(CONFIG_USB_RENESAS_USBHS) += renesas_usbhs/
+obj-$(CONFIG_USB_OTG_UTILS)     += otg/
+obj-$(CONFIG_USB_GADGET)        += gadget/