diff --git a/[refs] b/[refs]
index 3eb8b58f27dc..602c3660b49d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7283d5a044c010d5e68afccc0598846f254db7b
+refs/heads/master: b2006d91d8e389a04ffbf603b3896af93b0af427
diff --git a/trunk/drivers/usb/chipidea/Makefile b/trunk/drivers/usb/chipidea/Makefile
index cc3493769724..b69900a62a4d 100644
--- a/trunk/drivers/usb/chipidea/Makefile
+++ b/trunk/drivers/usb/chipidea/Makefile
@@ -5,10 +5,12 @@ 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
-endif