diff options
| author | Dave Jones <davej@redhat.com> | 2006-02-25 03:55:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-25 11:12:15 -0800 |
| commit | a0124d780d06db711e8a92135d774940588a27da (patch) | |
| tree | ff4e7fa1b314db2a30d78b0af00c2ea499b7e8fa /arch | |
| parent | 5c1ca65c93503b2c94359ba39640f9687bd192a3 (diff) | |
| download | blackbird-op-linux-a0124d780d06db711e8a92135d774940588a27da.tar.gz blackbird-op-linux-a0124d780d06db711e8a92135d774940588a27da.zip | |
[PATCH] x86-64: react to new topology.c location
Commit 9c869edac591977314323a4eaad5f7633fca684f moved the i386 topology.c
file. That change broke x86-64 compiles, as it uses the same file.
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86_64/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile index 72fe60c20d39..a098a11e7755 100644 --- a/arch/x86_64/kernel/Makefile +++ b/arch/x86_64/kernel/Makefile @@ -43,7 +43,7 @@ CFLAGS_vsyscall.o := $(PROFILING) -g0 bootflag-y += ../../i386/kernel/bootflag.o cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../i386/kernel/cpuid.o -topology-y += ../../i386/mach-default/topology.o +topology-y += ../../i386/kernel/topology.o microcode-$(subst m,y,$(CONFIG_MICROCODE)) += ../../i386/kernel/microcode.o intel_cacheinfo-y += ../../i386/kernel/cpu/intel_cacheinfo.o quirks-y += ../../i386/kernel/quirks.o |
