aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kvm/Makefile4
-rw-r--r--virt/kvm/iodev.h (renamed from drivers/kvm/iodev.h)0
-rw-r--r--virt/kvm/kvm_main.c (renamed from drivers/kvm/kvm_main.c)0
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile
index 880ffe403b35..af41534af496 100644
--- a/arch/x86/kvm/Makefile
+++ b/arch/x86/kvm/Makefile
@@ -2,9 +2,9 @@
2# Makefile for Kernel-based Virtual Machine module 2# Makefile for Kernel-based Virtual Machine module
3# 3#
4 4
5common-objs = $(addprefix ../../../drivers/kvm/, kvm_main.o) 5common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o)
6 6
7EXTRA_CFLAGS += -I drivers/kvm 7EXTRA_CFLAGS += -I virt/kvm
8 8
9kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \ 9kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \
10 ioapic.o 10 ioapic.o
diff --git a/drivers/kvm/iodev.h b/virt/kvm/iodev.h
index c14e642027b2..c14e642027b2 100644
--- a/drivers/kvm/iodev.h
+++ b/virt/kvm/iodev.h
diff --git a/drivers/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 4026d7d64296..4026d7d64296 100644
--- a/drivers/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c