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 /include/asm-mips | |
| parent | 9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff) | |
| parent | f64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/asmmacro-32.h | 2 | ||||
| -rw-r--r-- | include/asm-mips/asmmacro-64.h | 2 | ||||
| -rw-r--r-- | include/asm-mips/sim.h | 2 | ||||
| -rw-r--r-- | include/asm-mips/stackframe.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-mips/asmmacro-32.h b/include/asm-mips/asmmacro-32.h index ac8823df2554..11daf5ceb7b4 100644 --- a/include/asm-mips/asmmacro-32.h +++ b/include/asm-mips/asmmacro-32.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #ifndef _ASM_ASMMACRO_32_H | 7 | #ifndef _ASM_ASMMACRO_32_H |
| 8 | #define _ASM_ASMMACRO_32_H | 8 | #define _ASM_ASMMACRO_32_H |
| 9 | 9 | ||
| 10 | #include <asm/offset.h> | 10 | #include <asm/asm-offsets.h> |
| 11 | #include <asm/regdef.h> | 11 | #include <asm/regdef.h> |
| 12 | #include <asm/fpregdef.h> | 12 | #include <asm/fpregdef.h> |
| 13 | #include <asm/mipsregs.h> | 13 | #include <asm/mipsregs.h> |
diff --git a/include/asm-mips/asmmacro-64.h b/include/asm-mips/asmmacro-64.h index bbed35511f5a..559c355b9b86 100644 --- a/include/asm-mips/asmmacro-64.h +++ b/include/asm-mips/asmmacro-64.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #ifndef _ASM_ASMMACRO_64_H | 8 | #ifndef _ASM_ASMMACRO_64_H |
| 9 | #define _ASM_ASMMACRO_64_H | 9 | #define _ASM_ASMMACRO_64_H |
| 10 | 10 | ||
| 11 | #include <asm/offset.h> | 11 | #include <asm/asm-offsets.h> |
| 12 | #include <asm/regdef.h> | 12 | #include <asm/regdef.h> |
| 13 | #include <asm/fpregdef.h> | 13 | #include <asm/fpregdef.h> |
| 14 | #include <asm/mipsregs.h> | 14 | #include <asm/mipsregs.h> |
diff --git a/include/asm-mips/sim.h b/include/asm-mips/sim.h index 3ccfe09fa744..9c2af1b00e19 100644 --- a/include/asm-mips/sim.h +++ b/include/asm-mips/sim.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/config.h> | 12 | #include <linux/config.h> |
| 13 | 13 | ||
| 14 | #include <asm/offset.h> | 14 | #include <asm/asm-offsets.h> |
| 15 | 15 | ||
| 16 | #define __str2(x) #x | 16 | #define __str2(x) #x |
| 17 | #define __str(x) __str2(x) | 17 | #define __str(x) __str2(x) |
diff --git a/include/asm-mips/stackframe.h b/include/asm-mips/stackframe.h index fb42f99f8527..7b5e64600bc8 100644 --- a/include/asm-mips/stackframe.h +++ b/include/asm-mips/stackframe.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | #include <asm/asm.h> | 16 | #include <asm/asm.h> |
| 17 | #include <asm/mipsregs.h> | 17 | #include <asm/mipsregs.h> |
| 18 | #include <asm/offset.h> | 18 | #include <asm/asm-offsets.h> |
| 19 | 19 | ||
| 20 | .macro SAVE_AT | 20 | .macro SAVE_AT |
| 21 | .set push | 21 | .set push |