summaryrefslogtreecommitdiff
path: root/arch/arm/mm/proc-arm925.S
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-27 18:40:03 +0400
committerMark Brown <broonie@linaro.org>2013-08-27 18:40:03 +0400
commitdc1632321ba1e93dde25870e96cebe21b7d52517 (patch)
treed52d934c79b23f91654c571d983e1a6ec41b71fd /arch/arm/mm/proc-arm925.S
parent8c193b8dce4f2a2474dc2bc39ec972454df9d439 (diff)
parenta85f9da707366e856c0aad9e329db0cc59475290 (diff)
downloadlinux-dc1632321ba1e93dde25870e96cebe21b7d52517.tar.xz
Merge remote-tracking branch 'asoc/topic/dmic' into asoc-core
Diffstat (limited to 'arch/arm/mm/proc-arm925.S')
-rw-r--r--arch/arm/mm/proc-arm925.S2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
index 281eb9b9c1d6..97448c3acf38 100644
--- a/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
@@ -438,8 +438,6 @@ ENTRY(cpu_arm925_set_pte_ext)
#endif /* CONFIG_MMU */
mov pc, lr
- __CPUINIT
-
.type __arm925_setup, #function
__arm925_setup:
mov r0, #0