From: Avi Kivity <avi@qumranet.com>

Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/kvm/kvm_main.c |    2 --
 drivers/kvm/vmx.c      |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff -puN drivers/kvm/kvm_main.c~kvm-remove-vmx-includes-from-arch-independent-code drivers/kvm/kvm_main.c
--- a/drivers/kvm/kvm_main.c~kvm-remove-vmx-includes-from-arch-independent-code
+++ a/drivers/kvm/kvm_main.c
@@ -35,8 +35,6 @@
 #include <linux/file.h>
 #include <asm/desc.h>
 
-#include "vmx.h"
-#include "kvm_vmx.h"
 #include "x86_emulate.h"
 
 MODULE_AUTHOR("Qumranet");
diff -puN drivers/kvm/vmx.c~kvm-remove-vmx-includes-from-arch-independent-code drivers/kvm/vmx.c
--- a/drivers/kvm/vmx.c~kvm-remove-vmx-includes-from-arch-independent-code
+++ a/drivers/kvm/vmx.c
@@ -16,9 +16,9 @@
  */
 
 #include "kvm.h"
-#include <linux/module.h>
 #include "vmx.h"
 #include "kvm_vmx.h"
+#include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/highmem.h>
 #include <asm/io.h>
_