diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-21 17:30:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-21 17:30:37 -0400 |
| commit | f62378fcfc9c13a57b0b69dbd43336a4df8155a5 (patch) | |
| tree | b2682850f0d15079e0618ee09a23ba7ee71df55b /arch/arm/mm/proc-arm925.S | |
| parent | a418500b42c5c54f3f9d68036950c701740a2765 (diff) | |
| parent | 6a1ced59b3ac5d1088f597fd0613a724cdf19e2c (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mm/proc-arm925.S')
| -rw-r--r-- | arch/arm/mm/proc-arm925.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S index ee49aa2ca781..ee95c52db513 100644 --- a/arch/arm/mm/proc-arm925.S +++ b/arch/arm/mm/proc-arm925.S | |||
| @@ -521,7 +521,7 @@ cpu_arm925_name: | |||
| 521 | 521 | ||
| 522 | .align | 522 | .align |
| 523 | 523 | ||
| 524 | .section ".proc.info", #alloc, #execinstr | 524 | .section ".proc.info.init", #alloc, #execinstr |
| 525 | 525 | ||
| 526 | .type __arm925_proc_info,#object | 526 | .type __arm925_proc_info,#object |
| 527 | __arm925_proc_info: | 527 | __arm925_proc_info: |