diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 07:18:39 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 07:18:39 (GMT) |
commit | accf0fa697eeb5ff4c2360edc4da5b10abac0b7b (patch) | |
tree | a57dc9aa4a6b83be8ac8b4528cf06db5621e62aa /arch/x86/kernel/Makefile | |
parent | ebd60cd64f8ab1170102c3ab072eb73042b7a33d (diff) | |
parent | fe47784ba5cbb6b713c013e046859946789b45e4 (diff) | |
download | linux-fsl-qoriq-accf0fa697eeb5ff4c2360edc4da5b10abac0b7b.tar.xz |
Merge branch 'x86/xsave' into x86/core
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 dac24c4..c9be69f 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -38,7 +38,7 @@ obj-y += tsc.o io_delay.o rtc.o obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o obj-y += process.o -obj-y += i387.o +obj-y += i387.o xsave.o obj-y += ptrace.o obj-y += ds.o obj-$(CONFIG_X86_32) += tls.o |