diff --git a/arch/arm/plat-mxs/Makefile b/arch/arm/plat-mxs/Makefile
index 07cf095a6bc..2c271285bdf 100644
--- a/arch/arm/plat-mxs/Makefile
+++ b/arch/arm/plat-mxs/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 # Object file lists.
-obj-y += core.o clock.o pinctrl.o device.o timer-nomatch.o
+obj-y += core.o clock.o pinctrl.o device.o timer-nomatch.o usb_common.o
 
 obj-$(CONFIG_MXS_TIMER_WITH_MACH) += timer-match.o
 obj-$(CONFIG_IRAM_ALLOC) += iram.o
@@ -11,8 +11,8 @@ obj-$(CONFIG_GENERIC_GPIO) += gpio.o
 obj-$(CONFIG_MXS_ICOLL) += icoll.o
 
 obj-$(CONFIG_MXS_DMA_ENGINE) += dmaengine.o dma-apbh.o dma-apbx.o
-obj-$(CONFIG_ARCH_MXS) += utmixc.o
-obj-$(CONFIG_ARCH_MXS) += usb_common.o
+
+obj-$(CONFIG_USB_SUPPORT) += utmixc.o
 
 obj-$(CONFIG_MXS_LRADC) += lradc.o
 # Power Management