projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[linux-2.6]
/
arch
/
x86
/
kvm
/
Makefile
diff --git
a/arch/x86/kvm/Makefile
b/arch/x86/kvm/Makefile
index
d3ec292
..
b43c4ef
100644
(file)
--- a/
arch/x86/kvm/Makefile
+++ b/
arch/x86/kvm/Makefile
@@
-14,7
+14,7
@@
endif
EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kvm
kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \
- i8254.o
+ i8254.o
timer.o
obj-$(CONFIG_KVM) += kvm.o
kvm-intel-objs = vmx.o
obj-$(CONFIG_KVM_INTEL) += kvm-intel.o