summaryrefslogtreecommitdiffstats
path: root/target/cris/cpu.c
diff options
context:
space:
mode:
authorPeter Maydell2019-06-12 14:50:01 +0200
committerPeter Maydell2019-06-12 14:50:02 +0200
commit59c58f96b270f5edd4ad10954c3a96556cb3a728 (patch)
tree005ac413277b8b88a2a580eab2d10d45f25d2fc8 /target/cris/cpu.c
parentMerge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request'... (diff)
parentMAINTAINERS: Polish headline decorations (diff)
downloadqemu-59c58f96b270f5edd4ad10954c3a96556cb3a728.tar.gz
qemu-59c58f96b270f5edd4ad10954c3a96556cb3a728.tar.xz
qemu-59c58f96b270f5edd4ad10954c3a96556cb3a728.zip
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2019-06-11-v3' into staging
Miscellaneous patches for 2019-06-11 # gpg: Signature made Wed 12 Jun 2019 12:20:41 BST # gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653 # gpg: issuer "armbru@redhat.com" # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full] # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full] # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-misc-2019-06-11-v3: MAINTAINERS: Polish headline decorations MAINTAINERS: Improve section headlines MAINTAINERS: Remove duplicate entries of qemu-devel@nongnu.org Clean up a header guard symbols (again) Supply missing header guards Clean up a few header guard symbols scripts/clean-header-guards: Fix handling of trailing comments Normalize position of header guard Include qemu-common.h exactly where needed Include qemu/module.h where needed, drop it from qemu-common.h qemu-common: Move qemu_isalnum() etc. to qemu/ctype.h qemu-common: Move tcg_enabled() etc. to sysemu/tcg.h Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/cris/cpu.c')
-rw-r--r--target/cris/cpu.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/target/cris/cpu.c b/target/cris/cpu.c
index 1dce6d10c3..7adfd6caf4 100644
--- a/target/cris/cpu.c
+++ b/target/cris/cpu.c
@@ -25,7 +25,6 @@
#include "qapi/error.h"
#include "qemu/qemu-print.h"
#include "cpu.h"
-#include "qemu-common.h"
#include "mmu.h"