diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-27 18:40:03 +0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-27 18:40:03 +0400 |
commit | dc1632321ba1e93dde25870e96cebe21b7d52517 (patch) | |
tree | d52d934c79b23f91654c571d983e1a6ec41b71fd /arch/arm/mm/proc-arm740.S | |
parent | 8c193b8dce4f2a2474dc2bc39ec972454df9d439 (diff) | |
parent | a85f9da707366e856c0aad9e329db0cc59475290 (diff) | |
download | linux-dc1632321ba1e93dde25870e96cebe21b7d52517.tar.xz |
Merge remote-tracking branch 'asoc/topic/dmic' into asoc-core
Diffstat (limited to 'arch/arm/mm/proc-arm740.S')
-rw-r--r-- | arch/arm/mm/proc-arm740.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S index fde2d2a794cf..9b0ae90cbf17 100644 --- a/arch/arm/mm/proc-arm740.S +++ b/arch/arm/mm/proc-arm740.S @@ -60,8 +60,6 @@ ENTRY(cpu_arm740_reset) ENDPROC(cpu_arm740_reset) .popsection - __CPUINIT - .type __arm740_setup, #function __arm740_setup: mov r0, #0 |