diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
commit | 32a82e38679501da738199135b35f93ddc8aca0a (patch) | |
tree | ed280e079a8bab790b3dba5f62f1d300ada7540b /target/linux/patches/3.4.65/sparc-include.patch | |
parent | 90d5c8b73e8d538e121275b12e714332ca785cff (diff) | |
parent | 86c05906d3e804b41b9280c226a3a07f6fad5f27 (diff) |
resolve conflicts
Diffstat (limited to 'target/linux/patches/3.4.65/sparc-include.patch')
-rw-r--r-- | target/linux/patches/3.4.65/sparc-include.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/target/linux/patches/3.4.65/sparc-include.patch b/target/linux/patches/3.4.65/sparc-include.patch new file mode 100644 index 000000000..2f8ffd061 --- /dev/null +++ b/target/linux/patches/3.4.65/sparc-include.patch @@ -0,0 +1,11 @@ +diff -Nur linux-2.6.39-rc7.orig/arch/sparc/boot/btfixupprep.c linux-2.6.39-rc7/arch/sparc/boot/btfixupprep.c +--- linux-2.6.39-rc7.orig/arch/sparc/boot/btfixupprep.c 2011-05-10 04:33:54.000000000 +0200 ++++ linux-2.6.39-rc7/arch/sparc/boot/btfixupprep.c 2011-05-21 13:34:40.000000000 +0200 +@@ -25,7 +25,6 @@ + #include <errno.h> + #include <unistd.h> + #include <stdlib.h> +-#include <malloc.h> + + #define MAXSYMS 1024 + |