Merge branch 'sched/core' into cpus4096

Conflicts:
	include/linux/ftrace.h
	kernel/sched.c

1 files changed, 2 insertions, 3 deletions

diff --git a/arch/mips/mti-malta/Makefile b/arch/mips/mti-malta/Makefile
index cef2db8d2225..32e847808df1 100644
--- a/arch/mips/mti-malta/Makefile
+++ b/arch/mips/mti-malta/Makefile
@@ -7,9 +7,8 @@
 #
 obj-y                           := malta-amon.o malta-cmdline.o \
                                    malta-display.o malta-init.o malta-int.o \
-                                   malta-memory.o malta-mtd.o \
-                                   malta-platform.o malta-reset.o \
-                                   malta-setup.o malta-time.o
+                                   malta-memory.o malta-platform.o \
+                                   malta-reset.o malta-setup.o malta-time.o
 
 obj-$(CONFIG_EARLY_PRINTK)      += malta-console.o
 obj-$(CONFIG_PCI)               += malta-pci.o