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-arm922.S | |
| parent | a418500b42c5c54f3f9d68036950c701740a2765 (diff) | |
| parent | 6a1ced59b3ac5d1088f597fd0613a724cdf19e2c (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mm/proc-arm922.S')
| -rw-r--r-- | arch/arm/mm/proc-arm922.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S index 62bc34a139ee..23b8ed97f4e3 100644 --- a/arch/arm/mm/proc-arm922.S +++ b/arch/arm/mm/proc-arm922.S | |||
| @@ -456,7 +456,7 @@ cpu_arm922_name: | |||
| 456 | 456 | ||
| 457 | .align | 457 | .align |
| 458 | 458 | ||
| 459 | .section ".proc.info", #alloc, #execinstr | 459 | .section ".proc.info.init", #alloc, #execinstr |
| 460 | 460 | ||
| 461 | .type __arm922_proc_info,#object | 461 | .type __arm922_proc_info,#object |
| 462 | __arm922_proc_info: | 462 | __arm922_proc_info: |