diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-02 14:09:50 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-02 14:09:50 -0500 |
commit | a64d31baed104be25305e9c71585d3ea4ee9a418 (patch) | |
tree | 470e3c59ef39f38bcd69f8fef7dba8f76afbec53 /arch/x86/kernel/Makefile | |
parent | 1c39194878c09bd88ffc9c9d4c2f01c3397c7aed (diff) | |
parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/trace/ring_buffer.c
Diffstat (limited to 'arch/x86/kernel/Makefile')
-rw-r--r-- | arch/x86/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 1d8ed95da846..af2bc36ca1c4 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
@@ -46,7 +46,7 @@ obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o | |||
46 | obj-y += process.o | 46 | obj-y += process.o |
47 | obj-y += i387.o xsave.o | 47 | obj-y += i387.o xsave.o |
48 | obj-y += ptrace.o | 48 | obj-y += ptrace.o |
49 | obj-y += ds.o | 49 | obj-$(CONFIG_X86_DS) += ds.o |
50 | obj-$(CONFIG_X86_32) += tls.o | 50 | obj-$(CONFIG_X86_32) += tls.o |
51 | obj-$(CONFIG_IA32_EMULATION) += tls.o | 51 | obj-$(CONFIG_IA32_EMULATION) += tls.o |
52 | obj-y += step.o | 52 | obj-y += step.o |