Merge commit 'origin/master' into next

[linux-2.6-omap-h63xx.git] / arch / arm / mach-mx2 / Makefile

diff --git a/arch/arm/mach-mx2/Makefile b/arch/arm/mach-mx2/Makefile
index 6e1a2bffc812cf3df331c29fb06da4adb0e48316..950649a9154065f69d63ca0bd6dcc4343d43e814 100644 (file)
--- a/arch/arm/mach-mx2/Makefile
+++ b/arch/arm/mach-mx2/Makefile
@@ -4,7 +4,7 @@
 
 # Object file lists.
 
-obj-y  :=  system.o generic.o devices.o serial.o
+obj-y  :=  generic.o devices.o serial.o
 
 obj-$(CONFIG_MACH_MX21) += clock_imx21.o