diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 22:34:47 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 22:34:47 +0100 |
| commit | a0a55682b83fd5f012afadcf415b030d7424ae68 (patch) | |
| tree | 97ad3cb7e3443f09fbe55f57d3c36994b20a8e52 /arch/arm/mm/proc-arm926.S | |
| parent | 23beab76b490172a9ff3d52843e4d27a35b2a4c6 (diff) | |
| parent | 865a4fae7793b80e2b8bca76e279d6dfecbeac17 (diff) | |
| download | linux-stable-a0a55682b83fd5f012afadcf415b030d7424ae68.tar.gz linux-stable-a0a55682b83fd5f012afadcf415b030d7424ae68.tar.bz2 linux-stable-a0a55682b83fd5f012afadcf415b030d7424ae68.zip | |
Merge branch 'hotplug' into devel
Conflicts:
arch/arm/kernel/head-common.S
Diffstat (limited to 'arch/arm/mm/proc-arm926.S')
| -rw-r--r-- | arch/arm/mm/proc-arm926.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S index 73f1f3c68910..63d168b4ebe6 100644 --- a/arch/arm/mm/proc-arm926.S +++ b/arch/arm/mm/proc-arm926.S @@ -389,7 +389,7 @@ ENTRY(cpu_arm926_set_pte_ext) #endif mov pc, lr - __INIT + __CPUINIT .type __arm926_setup, #function __arm926_setup: |