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/frv/kernel/head.S | |
| 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/frv/kernel/head.S')
| -rw-r--r-- | arch/frv/kernel/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/kernel/head.S b/arch/frv/kernel/head.S index b825ef3f2d54..e9a8cc63ac94 100644 --- a/arch/frv/kernel/head.S +++ b/arch/frv/kernel/head.S | |||
| @@ -542,7 +542,7 @@ __head_end: | |||
| 542 | .size _boot, .-_boot | 542 | .size _boot, .-_boot |
| 543 | 543 | ||
| 544 | # provide a point for GDB to place a break | 544 | # provide a point for GDB to place a break |
| 545 | .section .text.start,"ax" | 545 | .section .text..start,"ax" |
| 546 | .globl _start | 546 | .globl _start |
| 547 | .balign 4 | 547 | .balign 4 |
| 548 | _start: | 548 | _start: |