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 'omap4-i2c-init' into omap-for-linus
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
cpu
/
Makefile
diff --git
a/arch/x86/kernel/cpu/Makefile
b/arch/x86/kernel/cpu/Makefile
index
c202b62
..
3a785da
100644
(file)
--- a/
arch/x86/kernel/cpu/Makefile
+++ b/
arch/x86/kernel/cpu/Makefile
@@
-14,7
+14,7
@@
CFLAGS_common.o := $(nostackp)
obj-y := intel_cacheinfo.o addon_cpuid_features.o
obj-y += proc.o capflags.o powerflags.o common.o
obj-y := intel_cacheinfo.o addon_cpuid_features.o
obj-y += proc.o capflags.o powerflags.o common.o
-obj-y += vmware.o hypervisor.o sched.o
+obj-y += vmware.o hypervisor.o sched.o
mshyperv.o
obj-$(CONFIG_X86_32) += bugs.o cmpxchg.o
obj-$(CONFIG_X86_64) += bugs_64.o
obj-$(CONFIG_X86_32) += bugs.o cmpxchg.o
obj-$(CONFIG_X86_64) += bugs_64.o