diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-09 13:09:57 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-09 13:09:57 -0500 |
commit | da5391edd18a1d75d4ca13f2dffe70e02f851110 (patch) | |
tree | 31ff5cc31b10a4a48f854d8e06090c49f92a6720 /linux-user/syscall.c | |
parent | 5689dc6557cecfd4318dea5490ecac4967081aed (diff) | |
parent | 5a61cb60d6ee8d49c553d7959363df26b55f4873 (diff) | |
download | qemu-da5391edd18a1d75d4ca13f2dffe70e02f851110.tar.gz |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'linux-user/syscall.c')
-rw-r--r-- | linux-user/syscall.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 6bdf4e6ab4..e87e17432e 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -60,7 +60,7 @@ int __clone2(int (*fn)(void *), void *child_stack_base, #include <netinet/ip.h> #include <netinet/tcp.h> #include <linux/wireless.h> -#include <qemu-common.h> +#include "qemu-common.h" #ifdef TARGET_GPROF #include <sys/gmon.h> #endif @@ -96,7 +96,6 @@ int __clone2(int (*fn)(void *), void *child_stack_base, #include "cpu-uname.h" #include "qemu.h" -#include "qemu-common.h" #if defined(CONFIG_USE_NPTL) #define CLONE_NPTL_FLAGS2 (CLONE_SETTLS | \ |