diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 18:46:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 18:46:49 -0400 |
| commit | 486a153f0e294f7cc735838edcb6b32e623cbe52 (patch) | |
| tree | f16a31eb3526968dd08aa93c12cbb211f31f2084 /arch/mips/lib | |
| parent | 9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff) | |
| parent | f64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'arch/mips/lib')
| -rw-r--r-- | arch/mips/lib/memcpy.S | 2 | ||||
| -rw-r--r-- | arch/mips/lib/strlen_user.S | 2 | ||||
| -rw-r--r-- | arch/mips/lib/strncpy_user.S | 2 | ||||
| -rw-r--r-- | arch/mips/lib/strnlen_user.S | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/lib/memcpy.S b/arch/mips/lib/memcpy.S index 90ee8d43261f..a78865f76547 100644 --- a/arch/mips/lib/memcpy.S +++ b/arch/mips/lib/memcpy.S | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | */ | 14 | */ |
| 15 | #include <linux/config.h> | 15 | #include <linux/config.h> |
| 16 | #include <asm/asm.h> | 16 | #include <asm/asm.h> |
| 17 | #include <asm/offset.h> | 17 | #include <asm/asm-offsets.h> |
| 18 | #include <asm/regdef.h> | 18 | #include <asm/regdef.h> |
| 19 | 19 | ||
| 20 | #define dst a0 | 20 | #define dst a0 |
diff --git a/arch/mips/lib/strlen_user.S b/arch/mips/lib/strlen_user.S index 07660e86c99d..eca558d83a37 100644 --- a/arch/mips/lib/strlen_user.S +++ b/arch/mips/lib/strlen_user.S | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | * Copyright (c) 1999 Silicon Graphics, Inc. | 7 | * Copyright (c) 1999 Silicon Graphics, Inc. |
| 8 | */ | 8 | */ |
| 9 | #include <asm/asm.h> | 9 | #include <asm/asm.h> |
| 10 | #include <asm/offset.h> | 10 | #include <asm/asm-offsets.h> |
| 11 | #include <asm/regdef.h> | 11 | #include <asm/regdef.h> |
| 12 | 12 | ||
| 13 | #define EX(insn,reg,addr,handler) \ | 13 | #define EX(insn,reg,addr,handler) \ |
diff --git a/arch/mips/lib/strncpy_user.S b/arch/mips/lib/strncpy_user.S index 14bed17c1648..d16c76fbfac7 100644 --- a/arch/mips/lib/strncpy_user.S +++ b/arch/mips/lib/strncpy_user.S | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | */ | 7 | */ |
| 8 | #include <linux/errno.h> | 8 | #include <linux/errno.h> |
| 9 | #include <asm/asm.h> | 9 | #include <asm/asm.h> |
| 10 | #include <asm/offset.h> | 10 | #include <asm/asm-offsets.h> |
| 11 | #include <asm/regdef.h> | 11 | #include <asm/regdef.h> |
| 12 | 12 | ||
| 13 | #define EX(insn,reg,addr,handler) \ | 13 | #define EX(insn,reg,addr,handler) \ |
diff --git a/arch/mips/lib/strnlen_user.S b/arch/mips/lib/strnlen_user.S index 6e7a8eed4de8..c0ea15194a0e 100644 --- a/arch/mips/lib/strnlen_user.S +++ b/arch/mips/lib/strnlen_user.S | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | * Copyright (c) 1999 Silicon Graphics, Inc. | 7 | * Copyright (c) 1999 Silicon Graphics, Inc. |
| 8 | */ | 8 | */ |
| 9 | #include <asm/asm.h> | 9 | #include <asm/asm.h> |
| 10 | #include <asm/offset.h> | 10 | #include <asm/asm-offsets.h> |
| 11 | #include <asm/regdef.h> | 11 | #include <asm/regdef.h> |
| 12 | 12 | ||
| 13 | #define EX(insn,reg,addr,handler) \ | 13 | #define EX(insn,reg,addr,handler) \ |