diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-17 20:52:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-17 20:53:10 +0200 |
| commit | 45bd00d31de886f8425b4dd33204b911b0a466a9 (patch) | |
| tree | 06204f2452e02ca916666173d50f5035d69065ef /arch/x86/kernel/Makefile | |
| parent | 40d9d82c8ab8c4e2373a23a1e31dc8d84c53aa01 (diff) | |
| parent | ab86e5765d41a5eb4239a1c04d613db87bea5ed8 (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: Pick up kernel/softirq.c update for dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/Makefile')
| -rw-r--r-- | arch/x86/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 430d5b24af7..832cb838cb4 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -52,6 +52,7 @@ obj-$(CONFIG_X86_DS_SELFTEST) += ds_selftest.o obj-$(CONFIG_X86_32) += tls.o obj-$(CONFIG_IA32_EMULATION) += tls.o obj-y += step.o +obj-$(CONFIG_INTEL_TXT) += tboot.o obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-y += cpu/ obj-y += acpi/ |