diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-08-14 08:14:50 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-08-14 08:14:50 -0700 |
| commit | 080e3da4f4bf693ec59bd98eae3ee5bd5b1dd047 (patch) | |
| tree | 2a367e97dcffe9ced54ff71b03ab893a3248fdb4 /arch/arm/mm/proc-arm740.S | |
| parent | e91f24ae027a583f2faff84456fa2630144bfed8 (diff) | |
| parent | 39c41df9c1950fba0ee6a4e7a63be281e89fe437 (diff) | |
| download | op-kernel-dev-080e3da4f4bf693ec59bd98eae3ee5bd5b1dd047.zip op-kernel-dev-080e3da4f4bf693ec59bd98eae3ee5bd5b1dd047.tar.gz | |
Merge branch 'zynq/dt' into next/dt
* zynq/dt: (1054 commits)
arm: zynq: dt: Set correct L2 ram latencies
+ v3.11-rc5
Conflicts:
arch/arm/Makefile
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 fde2d2a..9b0ae90 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 |
