git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Manual merge with Linus
[pandora-kernel.git]
/
arch
/
mips
/
lib
/
memcpy.S
diff --git
a/arch/mips/lib/memcpy.S
b/arch/mips/lib/memcpy.S
index
90ee8d4
..
a78865f
100644
(file)
--- a/
arch/mips/lib/memcpy.S
+++ b/
arch/mips/lib/memcpy.S
@@
-14,7
+14,7
@@
*/
#include <linux/config.h>
#include <asm/asm.h>
-#include <asm/
offset
.h>
+#include <asm/
asm-offsets
.h>
#include <asm/regdef.h>
#define dst a0