diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-03 15:18:51 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-03 15:18:51 +0200 |
| commit | fa696c90962aa3f8e3853816d6b46905d3efa08c (patch) | |
| tree | 3a9fa81243fea131a5785f1bcb5ad2c9a785a4f9 /package/qemu/patches/patch-linux-user_syscall_c | |
| parent | c79407bcee5a5a9a1a718efb54e851e939e6f8d1 (diff) | |
| parent | c45554b525fe43c6c70a4b2cc4dc84f7dc0cf25d (diff) | |
Merge branch 'master' of git+ssh://www.openadk.org/git/openadk
Diffstat (limited to 'package/qemu/patches/patch-linux-user_syscall_c')
| -rw-r--r-- | package/qemu/patches/patch-linux-user_syscall_c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/package/qemu/patches/patch-linux-user_syscall_c b/package/qemu/patches/patch-linux-user_syscall_c index 1eba70417..aa243b148 100644 --- a/package/qemu/patches/patch-linux-user_syscall_c +++ b/package/qemu/patches/patch-linux-user_syscall_c @@ -1,22 +1,26 @@ ---- qemu-1.7.0.orig/linux-user/syscall.c 2013-11-27 23:15:55.000000000 +0100 -+++ qemu-1.7.0/linux-user/syscall.c 2014-01-31 09:51:34.051058876 +0100 -@@ -64,6 +64,7 @@ int __clone2(int (*fn)(void *), void *ch +--- qemu-1.7.1.orig/linux-user/syscall.c 2014-03-25 15:01:10.000000000 +0100 ++++ qemu-1.7.1/linux-user/syscall.c 2014-04-02 16:56:13.483513278 +0200 +@@ -63,6 +63,7 @@ int __clone2(int (*fn)(void *), void *ch + //#include <sys/user.h> #include <netinet/ip.h> #include <netinet/tcp.h> - #include <linux/wireless.h> +#include <linux/version.h> + #include <linux/wireless.h> #include <linux/icmp.h> #include "qemu-common.h" - #ifdef TARGET_GPROF -@@ -94,7 +95,11 @@ int __clone2(int (*fn)(void *), void *ch +@@ -94,7 +95,15 @@ int __clone2(int (*fn)(void *), void *ch #include <linux/utsname.h> #include <linux/cdrom.h> #include <linux/hdreg.h> ++#ifdef NATIVE +#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0) #include <linux/soundcard.h> +#else +#include <linux/soundcard.h.oss3> +#endif ++#else ++#include <linux/soundcard.h> ++#endif #include <linux/kd.h> #include <linux/mtio.h> #include <linux/fs.h> |