Merge tag 'microblaze-3.12-rc1' of git://git.monstr.eu/linux-2.6-microblaze

[karo-tx-linux.git] / arch / arm / kernel / Makefile

diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index fccfbdb03df183d840d5a4f1191606df243d05d8..5140df5f23aa485214914a8dfbfdf31dc04a5691 100644 (file)
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -16,7 +16,7 @@ CFLAGS_REMOVE_return_address.o = -pg
 # Object file lists.
 
 obj-y          := elf.o entry-common.o irq.o opcodes.o \
-                  process.o ptrace.o return_address.o sched_clock.o \
+                  process.o ptrace.o return_address.o \
                   setup.o signal.o stacktrace.o sys_arm.o time.o traps.o
 
 obj-$(CONFIG_ATAGS)            += atags_parse.o
@@ -24,7 +24,7 @@ obj-$(CONFIG_ATAGS_PROC)      += atags_proc.o
 obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += atags_compat.o
 
 ifeq ($(CONFIG_CPU_V7M),y)
-obj-y          += entry-v7m.o
+obj-y          += entry-v7m.o v7m.o
 else
 obj-y          += entry-armv.o
 endif