diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-22 10:29:42 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-22 10:29:42 -0500 |
commit | 9ba2a054db309646946d7e01f87693b09a6bdb11 (patch) | |
tree | e71dfdc6056c7515206c52dbbaecfb933a813de8 /hw | |
parent | bdd2672109caa5cbdd955ef5c7a05b49a6b44fbe (diff) | |
parent | 7b0a03a1eab52ed2f59c8e4cb2210ee74433a820 (diff) |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'hw')
-rw-r--r-- | hw/xen_nic.c | 1 | ||||
-rw-r--r-- | hw/xics.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/hw/xen_nic.c b/hw/xen_nic.c index aeca8da96b..ef2a2d6997 100644 --- a/hw/xen_nic.c +++ b/hw/xen_nic.c @@ -25,7 +25,6 @@ #include <inttypes.h> #include <fcntl.h> #include <errno.h> -#include <pthread.h> #include <sys/socket.h> #include <sys/ioctl.h> #include <sys/types.h> @@ -29,8 +29,6 @@ #include "hw/spapr.h" #include "hw/xics.h" -#include <pthread.h> - /* * ICP: Presentation layer */ |