Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[karo-tx-linux.git] / drivers / usb / chipidea / Makefile

diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile
index cc3493769724352bdb6684cd6759a3681f6af48c..5c66d9c330ca4fe3712a9c653e3ee69190347323 100644 (file)
--- a/drivers/usb/chipidea/Makefile
+++ b/drivers/usb/chipidea/Makefile
@@ -5,10 +5,15 @@ ci_hdrc-$(CONFIG_USB_CHIPIDEA_UDC)    += udc.o
 ci_hdrc-$(CONFIG_USB_CHIPIDEA_HOST)    += host.o
 ci_hdrc-$(CONFIG_USB_CHIPIDEA_DEBUG)   += debug.o
 
+# Glue/Bridge layers go here
+
+obj-$(CONFIG_USB_CHIPIDEA)     += ci13xxx_msm.o
+
+# PCI doesn't provide stubs, need to check
 ifneq ($(CONFIG_PCI),)
        obj-$(CONFIG_USB_CHIPIDEA)      += ci13xxx_pci.o
 endif
 
-ifneq ($(CONFIG_ARCH_MSM),)
-       obj-$(CONFIG_USB_CHIPIDEA)      += ci13xxx_msm.o
+ifneq ($(CONFIG_OF_DEVICE),)
+       obj-$(CONFIG_USB_CHIPIDEA)      += ci13xxx_imx.o
 endif