git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
cpu
/
Makefile
diff --git
a/arch/x86/kernel/cpu/Makefile
b/arch/x86/kernel/cpu/Makefile
index
65b1be5
..
ee76eaa
100644
(file)
--- a/
arch/x86/kernel/cpu/Makefile
+++ b/
arch/x86/kernel/cpu/Makefile
@@
-6,7
+6,7
@@
obj-y := intel_cacheinfo.o addon_cpuid_features.o
obj-y += proc.o feature_names.o
obj-$(CONFIG_X86_32) += common.o bugs.o
-obj-$(CONFIG_X86_64) += bugs_64.o
+obj-$(CONFIG_X86_64) +=
common_64.o
bugs_64.o
obj-$(CONFIG_X86_32) += amd.o
obj-$(CONFIG_X86_64) += amd_64.o
obj-$(CONFIG_X86_32) += cyrix.o