Merge branch 'fix/hda' into for-linus

[~andy/linux] / arch / x86 / kvm / Makefile

diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile
index 7c56850b82cb3518bc02b486548d37fbea82101e..0e7fe78d0f7493fc3525a3564469b20ccd6da79e 100644 (file)
--- a/arch/x86/kvm/Makefile
+++ b/arch/x86/kvm/Makefile
@@ -7,10 +7,9 @@ CFLAGS_vmx.o := -I.
 
 kvm-y                  += $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \
                                coalesced_mmio.o irq_comm.o eventfd.o)
-kvm-$(CONFIG_KVM_TRACE)        += $(addprefix ../../../virt/kvm/, kvm_trace.o)
 kvm-$(CONFIG_IOMMU_API)        += $(addprefix ../../../virt/kvm/, iommu.o)
 
-kvm-y                  += x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \
+kvm-y                  += x86.o mmu.o emulate.o i8259.o irq.o lapic.o \
                           i8254.o timer.o
 kvm-intel-y            += vmx.o
 kvm-amd-y              += svm.o