summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-06-12 13:40:12 -0700
committerKevin Hilman <khilman@linaro.org>2015-06-12 13:40:12 -0700
commite75ea4569d6d1d10935d74ff80bad52dc09bd062 (patch)
treebc5787cd5124233f6958ef3136b8a019e5c2ffd1 /arch/arm/mach-imx
parent7b38951b4e1315d3427b78f2095ced8ed9dbdfda (diff)
parent2678bb9fa137726a0b83dd61a9c1636543066755 (diff)
downloadlwn-e75ea4569d6d1d10935d74ff80bad52dc09bd062.tar.gz
lwn-e75ea4569d6d1d10935d74ff80bad52dc09bd062.zip
Merge branch 'for-arm-soc' of http://ftp.arm.linux.org.uk/pub/armlinux/kernel/git-cur/linux-2.6-arm into next/cleanup
* 'for-arm-soc' of http://ftp.arm.linux.org.uk/pub/armlinux/kernel/git-cur/linux-2.6-arm: ARM: fix EFM32 build breakage caused by cpu_resume_arm ARM: 8389/1: Add cpu_resume_arm() for firmwares that resume in ARM state ARM: v7 setup function should invalidate L1 cache
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/headsmp.S1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/headsmp.S b/arch/arm/mach-imx/headsmp.S
index de5047c8a6c8..b5e976816b63 100644
--- a/arch/arm/mach-imx/headsmp.S
+++ b/arch/arm/mach-imx/headsmp.S
@@ -25,7 +25,6 @@ diag_reg_offset:
.endm
ENTRY(v7_secondary_startup)
- bl v7_invalidate_l1
set_diag_reg
b secondary_startup
ENDPROC(v7_secondary_startup)