summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/platsmp.c
diff options
context:
space:
mode:
authorLoic PALLARDY <loic.pallardy@st.com>2012-09-03 15:10:23 +0200
committerOlof Johansson <olof@lixom.net>2012-09-04 21:38:14 -0700
commit79964bcd792fd9625affb4d7092ee09697f0409a (patch)
treeb2df34d67daf72d43d778a07ac6b923a3d421251 /arch/arm/mach-ux500/platsmp.c
parent1d3266ecca67066e537fe0e0669bed77d355f886 (diff)
downloadlinux-stable-79964bcd792fd9625affb4d7092ee09697f0409a.tar.gz
linux-stable-79964bcd792fd9625affb4d7092ee09697f0409a.tar.bz2
linux-stable-79964bcd792fd9625affb4d7092ee09697f0409a.zip
ARM: ux500: Correct Ux500 family names usage
Update users with cpu_is_ux540_family() to keep x540 family functional. Signed-off-by: Loic Pallardy <loic.pallardy@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-ux500/platsmp.c')
-rw-r--r--arch/arm/mach-ux500/platsmp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c
index cb35897c1ea3..a5dda68444db 100644
--- a/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@ -118,7 +118,7 @@ static void __init wakeup_secondary(void)
{
void __iomem *backupram;
- if (cpu_is_u8500_family())
+ if (cpu_is_u8500_family() || cpu_is_ux540_family())
backupram = __io_address(U8500_BACKUPRAM0_BASE);
else
ux500_unknown_soc();