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-arm1020e.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-arm1020e.S')
| -rw-r--r-- | arch/arm/mm/proc-arm1020e.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S index 1a511e765909..afc06b9c3133 100644 --- a/arch/arm/mm/proc-arm1020e.S +++ b/arch/arm/mm/proc-arm1020e.S | |||
| @@ -412,7 +412,7 @@ ENTRY(cpu_arm1020e_set_pte_ext) | |||
| 412 | #endif /* CONFIG_MMU */ | 412 | #endif /* CONFIG_MMU */ |
| 413 | mov pc, lr | 413 | mov pc, lr |
| 414 | 414 | ||
| 415 | __INIT | 415 | __CPUINIT |
| 416 | 416 | ||
| 417 | .type __arm1020e_setup, #function | 417 | .type __arm1020e_setup, #function |
| 418 | __arm1020e_setup: | 418 | __arm1020e_setup: |