diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-17 03:58:25 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-17 03:58:25 -0400 |
| commit | bb3c3e807140816b5f5fd4840473ee52a916ad4f (patch) | |
| tree | 9e8a69d266a7df86ca16177eefffab4b4e910753 /arch/arm/mm/proc-sa1100.S | |
| parent | 595c36490deb49381dc51231a3d5e6b66786ed27 (diff) | |
| parent | 012abeea669ea49636cf952d13298bb68654146a (diff) | |
Merge commit 'v2.6.32-rc5' into perf/probes
Conflicts:
kernel/trace/trace_event_profile.c
Merge reason: update to -rc5 and resolve conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mm/proc-sa1100.S')
| -rw-r--r-- | arch/arm/mm/proc-sa1100.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S index 451e2d953e2a..ee7700242c19 100644 --- a/arch/arm/mm/proc-sa1100.S +++ b/arch/arm/mm/proc-sa1100.S | |||
| @@ -214,7 +214,7 @@ sa1100_crval: | |||
| 214 | .type sa1100_processor_functions, #object | 214 | .type sa1100_processor_functions, #object |
| 215 | ENTRY(sa1100_processor_functions) | 215 | ENTRY(sa1100_processor_functions) |
| 216 | .word v4_early_abort | 216 | .word v4_early_abort |
| 217 | .word pabort_noifar | 217 | .word legacy_pabort |
| 218 | .word cpu_sa1100_proc_init | 218 | .word cpu_sa1100_proc_init |
| 219 | .word cpu_sa1100_proc_fin | 219 | .word cpu_sa1100_proc_fin |
| 220 | .word cpu_sa1100_reset | 220 | .word cpu_sa1100_reset |