Merge branch '3.0-pcm052' of ssh://github.com/tsfs/Vybrid-Linux into 3.0-pcm0523.0-pcm052-ts2.1

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile
index e2abb624f9d1..238788df23da 100755
--- a/arch/arm/plat-mxc/Makefile
+++ b/arch/arm/plat-mxc/Makefile
@@ -3,12 +3,14 @@
 #
 
 # Common support
-obj-y := clock.o time.o devices.o cpu.o system.o irq-common.o usb_common.o usb_wakeup.o
+#obj-y := clock.o time.o devices.o cpu.o system.o irq-common.o usb_common.o usb_wakeup.o
+obj-y := clock.o devices.o cpu.o system.o irq-common.o usb_common.o usb_wakeup.o
 
 ifdef CONFIG_ARCH_MVF
 obj-y += gpio-mvf.o
 else
 obj-y += gpio.o
+obj-y += time.o
 endif
 
 # MX51 uses the TZIC interrupt controller, older platforms use AVIC