Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.9-20170329' into staging

[mirror_qemu.git] / blockdev-nbd.c

diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index 81bca1760f5ad53cae294d08a920850d9f5bf333..7ea836b46e918fd5e299b741aab39c6d721b2267 100644 (file)
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -16,7 +16,6 @@
 #include "qapi/qmp/qerror.h"
 #include "sysemu/sysemu.h"
 #include "qmp-commands.h"
-#include "trace.h"
 #include "block/nbd.h"
 #include "io/channel-socket.h"