diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 23:34:47 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 23:34:47 +0200 |
| commit | a0a55682b83fd5f012afadcf415b030d7424ae68 (patch) | |
| tree | 97ad3cb7e3443f09fbe55f57d3c36994b20a8e52 /arch/arm/mm/proc-arm920.S | |
| parent | Merge branches 'at91', 'dcache', 'ftrace', 'hwbpt', 'misc', 'mmci', 's3c', 's... (diff) | |
| parent | ARM: add register documentation for __enable_mmu (diff) | |
| download | linux-a0a55682b83fd5f012afadcf415b030d7424ae68.tar.xz linux-a0a55682b83fd5f012afadcf415b030d7424ae68.zip | |
Merge branch 'hotplug' into devel
Conflicts:
arch/arm/kernel/head-common.S
Diffstat (limited to 'arch/arm/mm/proc-arm920.S')
| -rw-r--r-- | arch/arm/mm/proc-arm920.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S index 86f80aa56216..fecf570939f3 100644 --- a/arch/arm/mm/proc-arm920.S +++ b/arch/arm/mm/proc-arm920.S @@ -375,7 +375,7 @@ ENTRY(cpu_arm920_set_pte_ext) #endif mov pc, lr - __INIT + __CPUINIT .type __arm920_setup, #function __arm920_setup: |