diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 17:34:47 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 17:34:47 -0400 |
| commit | a0a55682b83fd5f012afadcf415b030d7424ae68 (patch) | |
| tree | 97ad3cb7e3443f09fbe55f57d3c36994b20a8e52 /arch/arm/mm/proc-sa110.S | |
| parent | 23beab76b490172a9ff3d52843e4d27a35b2a4c6 (diff) | |
| parent | 865a4fae7793b80e2b8bca76e279d6dfecbeac17 (diff) | |
Merge branch 'hotplug' into devel
Conflicts:
arch/arm/kernel/head-common.S
Diffstat (limited to 'arch/arm/mm/proc-sa110.S')
| -rw-r--r-- | arch/arm/mm/proc-sa110.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S index a201eb04b5e1..5aa8d59c2e85 100644 --- a/arch/arm/mm/proc-sa110.S +++ b/arch/arm/mm/proc-sa110.S | |||
| @@ -156,7 +156,7 @@ ENTRY(cpu_sa110_set_pte_ext) | |||
| 156 | #endif | 156 | #endif |
| 157 | mov pc, lr | 157 | mov pc, lr |
| 158 | 158 | ||
| 159 | __INIT | 159 | __CPUINIT |
| 160 | 160 | ||
| 161 | .type __sa110_setup, #function | 161 | .type __sa110_setup, #function |
| 162 | __sa110_setup: | 162 | __sa110_setup: |