diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:19 -0400 |
| commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
| tree | 061166d873d9da9cf83044a7593ad111787076c5 /arch/mips | |
| parent | 0f2c3de2ba110626515234d5d584fb1b0c0749a2 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/lasat/image/head.S | 2 | ||||
| -rw-r--r-- | arch/mips/lasat/image/romscript.normal | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/lasat/image/head.S b/arch/mips/lasat/image/head.S index efb95f2609c2..e0ecda92c40a 100644 --- a/arch/mips/lasat/image/head.S +++ b/arch/mips/lasat/image/head.S | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #include <asm/lasat/head.h> | 1 | #include <asm/lasat/head.h> |
| 2 | 2 | ||
| 3 | .text | 3 | .text |
| 4 | .section .text.start, "ax" | 4 | .section .text..start, "ax" |
| 5 | .set noreorder | 5 | .set noreorder |
| 6 | .set mips3 | 6 | .set mips3 |
| 7 | 7 | ||
diff --git a/arch/mips/lasat/image/romscript.normal b/arch/mips/lasat/image/romscript.normal index 988f8ad189cb..0864c963e188 100644 --- a/arch/mips/lasat/image/romscript.normal +++ b/arch/mips/lasat/image/romscript.normal | |||
| @@ -4,7 +4,7 @@ SECTIONS | |||
| 4 | { | 4 | { |
| 5 | .text : | 5 | .text : |
| 6 | { | 6 | { |
| 7 | *(.text.start) | 7 | *(.text..start) |
| 8 | } | 8 | } |
| 9 | 9 | ||
| 10 | /* Data in ROM */ | 10 | /* Data in ROM */ |