aboutsummaryrefslogtreecommitdiff
path: root/cpu-exec.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-06-22 07:13:10 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-06-22 07:13:10 -0500
commitd6034a3a61235042a0d79dcc1dfed0fbf461fb18 (patch)
tree78625b5d83f8b8410fccc9c008e201da11697449 /cpu-exec.c
parentfdba9594df8eb2e2ac16bba95308e4159ffbb9e4 (diff)
parentca98557ad2510eaeb6538b4c4d9972818e83b6c2 (diff)
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
Diffstat (limited to 'cpu-exec.c')
-rw-r--r--cpu-exec.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/cpu-exec.c b/cpu-exec.c
index e1de56b397..7aa1d004e8 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -20,7 +20,6 @@
#include "exec.h"
#include "disas.h"
#include "tcg.h"
-#include "kvm.h"
#include "qemu-barrier.h"
#if defined(__sparc__) && !defined(CONFIG_SOLARIS)