diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-22 04:34:08 +0200 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-22 04:34:08 +0200 |
commit | a3536c839f04682ed06c84a7f75968c27c6108c8 (patch) | |
tree | 92c26ea74c0ffb9b83a2285ad2539cc271b09856 /arch/arm/mm/proc-arm1026.S | |
parent | [PATCH] Updated ipw2200 to compile with ieee80211 abg_ture to abg_true change (diff) | |
parent | [PATCH] uml: fix compile warning after consolidation patch (diff) | |
download | linux-a3536c839f04682ed06c84a7f75968c27c6108c8.tar.xz linux-a3536c839f04682ed06c84a7f75968c27c6108c8.zip |
Merge /spare/repo/linux-2.6/
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 931b690d1be2..10317e4f55d2 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: |