Merge remote-tracking branch 'quintela/thread-20121220.next' into staging

[qemu.git] / slirp / if.c

diff --git a/slirp/if.c b/slirp/if.c
index 533295dd075c1bd9f07b8dedcb9768dc5420c190..dcd5fafe5d27cf5128c6c8b92162ee6d2b527ebe 100644 (file)
--- a/slirp/if.c
+++ b/slirp/if.c
@@ -6,7 +6,7 @@
  */
 
 #include <slirp.h>
-#include "qemu-timer.h"
+#include "qemu/timer.h"
 
 static void
 ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead)