diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-21 21:30:37 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-21 21:30:37 (GMT) |
commit | f62378fcfc9c13a57b0b69dbd43336a4df8155a5 (patch) | |
tree | b2682850f0d15079e0618ee09a23ba7ee71df55b /arch/arm/mm/proc-arm1026.S | |
parent | a418500b42c5c54f3f9d68036950c701740a2765 (diff) | |
parent | 6a1ced59b3ac5d1088f597fd0613a724cdf19e2c (diff) | |
download | linux-f62378fcfc9c13a57b0b69dbd43336a4df8155a5.tar.xz |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mm/proc-arm1026.S')
-rw-r--r-- | arch/arm/mm/proc-arm1026.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S index 931b690..10317e4 100644 --- a/arch/arm/mm/proc-arm1026.S +++ b/arch/arm/mm/proc-arm1026.S @@ -469,7 +469,7 @@ cpu_arm1026_name: .align - .section ".proc.info", #alloc, #execinstr + .section ".proc.info.init", #alloc, #execinstr .type __arm1026_proc_info,#object __arm1026_proc_info: |