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-arm1022.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-arm1022.S')
| -rw-r--r-- | arch/arm/mm/proc-arm1022.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S index 1ffa4eb9c34f..8915e0ba3fe5 100644 --- a/arch/arm/mm/proc-arm1022.S +++ b/arch/arm/mm/proc-arm1022.S | |||
| @@ -394,7 +394,7 @@ ENTRY(cpu_arm1022_set_pte_ext) | |||
| 394 | #endif /* CONFIG_MMU */ | 394 | #endif /* CONFIG_MMU */ |
| 395 | mov pc, lr | 395 | mov pc, lr |
| 396 | 396 | ||
| 397 | __INIT | 397 | __CPUINIT |
| 398 | 398 | ||
| 399 | .type __arm1022_setup, #function | 399 | .type __arm1022_setup, #function |
| 400 | __arm1022_setup: | 400 | __arm1022_setup: |