diff options
| author |   Markus Metzger <markus.t.metzger@intel.com> | 2008-11-25 08:45:13 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-11-25 17:28:50 +0100 |
| commit | 292c669cd7087a090d6420e223eb1072f3e3c50b (patch) | |
| tree | 631cd5e54c77e2a249c7bc88a7eb87ce776b720b /arch/x86/kernel/Makefile | |
| parent | arch/x86/kernel/pci-calgary_64.c: change simple_strtol to simple_strtoul (diff) | |
| download | linux-dev-292c669cd7087a090d6420e223eb1072f3e3c50b.tar.xz linux-dev-292c669cd7087a090d6420e223eb1072f3e3c50b.zip | |
x86, bts: exclude ds.c from build when disabled
Impact: cleanup
Move the CONFIG guard from the .c file into the makefile.
Reported-by: Andi Kleen <andi-suse@firstfloor.org>
Signed-off-by: Markus Metzger <markus.t.metzger@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 e489ff9cb3e2..b62a7667828e 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -41,7 +41,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 |