summary refs log tree commit diff stats
path: root/hw/usb
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-06-14 16:32:32 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-06-14 16:32:32 +0100
commit49237b856ae58ee7955be0b959c504c51b014f20 (patch)
tree7b827dc81ed79226b9e4d15f266bcf6de51bdd87 /hw/usb
parent1be08a0946b1a189ac72822182c37367e8cd3d87 (diff)
parentb1b23e5bbfb66d9401e2c2b0646fb721d94a3f83 (diff)
downloadfocaccia-qemu-49237b856ae58ee7955be0b959c504c51b014f20.tar.gz
focaccia-qemu-49237b856ae58ee7955be0b959c504c51b014f20.zip
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20160614-tag' into staging
Xen 2016/06/14

# gpg: Signature made Tue 14 Jun 2016 16:01:52 BST
# gpg:                using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3  0AEA 894F 8F48 70E1 AE90

* remotes/sstabellini/tags/xen-20160614-tag:
  xen: Clean up includes
  xen/blkif: avoid double access to any shared ring request fields

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb')
-rw-r--r--hw/usb/xen-usb.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c
index 664df04181..8fa47edd9a 100644
--- a/hw/usb/xen-usb.c
+++ b/hw/usb/xen-usb.c
@@ -19,13 +19,10 @@
  *  GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include <libusb.h>
-#include <stdio.h>
-#include <sys/types.h>
 #include <sys/mman.h>
-#include <sys/time.h>
 
-#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/config-file.h"
 #include "hw/sysbus.h"