projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'tracing/core', 'x86/urgent' and 'x86/ptrace' into tracing/hw-branch...
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
arch
/
x86
/
kernel
/
Makefile
diff --git
a/arch/x86/kernel/Makefile
b/arch/x86/kernel/Makefile
index
1d8ed95
..
af2bc36
100644
(file)
--- a/
arch/x86/kernel/Makefile
+++ b/
arch/x86/kernel/Makefile
@@
-46,7
+46,7
@@
obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o
obj-y += process.o
obj-y += i387.o xsave.o
obj-y += ptrace.o
-obj-
y
+= ds.o
+obj-
$(CONFIG_X86_DS)
+= ds.o
obj-$(CONFIG_X86_32) += tls.o
obj-$(CONFIG_IA32_EMULATION) += tls.o
obj-y += step.o