Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[~andy/linux] / drivers / usb / Makefile

diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 8f5ebced5df0010e4d881c7978a5e132d92c8306..238c5d47cadb47d469d871ad6cf0e86dc0675c8f 100644 (file)
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -6,8 +6,6 @@
 
 obj-$(CONFIG_USB)              += core/
 
-obj-$(CONFIG_USB_OTG_UTILS)    += otg/
-
 obj-$(CONFIG_USB_DWC3)         += dwc3/
 
 obj-$(CONFIG_USB_MON)          += mon/
@@ -27,6 +25,7 @@ obj-$(CONFIG_USB_HWA_HCD)     += host/
 obj-$(CONFIG_USB_ISP1760_HCD)  += host/
 obj-$(CONFIG_USB_IMX21_HCD)    += host/
 obj-$(CONFIG_USB_FSL_MPH_DR_OF)        += host/
+obj-$(CONFIG_USB_FUSBH200_HCD) += host/
 
 obj-$(CONFIG_USB_C67X00_HCD)   += c67x00/
 
@@ -46,7 +45,7 @@ obj-$(CONFIG_USB_MICROTEK)    += image/
 obj-$(CONFIG_USB_SERIAL)       += serial/
 
 obj-$(CONFIG_USB)              += misc/
-obj-$(CONFIG_USB_OTG_UTILS)    += phy/
+obj-$(CONFIG_USB_PHY)          += phy/
 obj-$(CONFIG_EARLY_PRINTK_DBGP)        += early/
 
 obj-$(CONFIG_USB_ATM)          += atm/