Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftrace

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

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index d274425fb0766d1edfbf0fa8db95b2c1fd21195e..a3049da61985f777bbbcc0c2eedb9b3820b4d63b 100644 (file)
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -31,7 +31,7 @@ CFLAGS_tsc.o          := $(nostackp)
 
 obj-y                  := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o
 obj-y                  += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o
-obj-y                  += time_$(BITS).o ioport.o ldt.o
+obj-y                  += time_$(BITS).o ioport.o ldt.o dumpstack.o
 obj-y                  += setup.o i8259.o irqinit_$(BITS).o setup_percpu.o
 obj-$(CONFIG_X86_VISWS)        += visws_quirks.o
 obj-$(CONFIG_X86_32)   += probe_roms_32.o