---

yaml --- r: 93820 b: refs/heads/master c: 7837699 h: refs/heads/master v: v3
git-mirror · Apr 27, 2008 · f5c034c · f5c034c
1 parent 354650f
commit f5c034c
Show file tree

Hide file tree

Showing 8 changed files with 665 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fcaa98267efc4d39ded9b0bc33c6b4a2f62fecd
+refs/heads/master: 7837699fa6d7adf81f26ab73a5f6897ea1ab9d6a
diff --git a/trunk/arch/x86/kvm/Makefile b/trunk/arch/x86/kvm/Makefile
@@ -6,7 +6,8 @@ common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o)
 
 EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kvm
 
-kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o
+kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \
+	i8254.o
 obj-$(CONFIG_KVM) += kvm.o
 kvm-intel-objs = vmx.o
 obj-$(CONFIG_KVM_INTEL) += kvm-intel.o