summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-spear
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-01-25 23:09:57 +0000
committerArnd Bergmann <arnd@arndb.de>2013-03-12 17:40:24 +0100
commitaf63275bc4da161f4c78c8ddcddc9f90c2d2d194 (patch)
tree9e7ffd72422d0e97865385fb46d679983b3563b9 /arch/arm/mach-spear
parent5b65fc560398dd849dbe9f0df68d3934089c894a (diff)
downloadlinux-stable-af63275bc4da161f4c78c8ddcddc9f90c2d2d194.tar.gz
linux-stable-af63275bc4da161f4c78c8ddcddc9f90c2d2d194.tar.bz2
linux-stable-af63275bc4da161f4c78c8ddcddc9f90c2d2d194.zip
ARM: spear: fix build error in restart.c
We can now enable mach-spear without selecting any of the machines in a multiplatform configuration. Doing so causes a build error that is trivial to fix by making both the spear13xx and the spear3xx/6xx portion of this file conditional rather than alternatives. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat (limited to 'arch/arm/mach-spear')
-rw-r--r--arch/arm/mach-spear/restart.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-spear/restart.c b/arch/arm/mach-spear/restart.c
index 004f0f2ff1c6..2b44500bb718 100644
--- a/arch/arm/mach-spear/restart.c
+++ b/arch/arm/mach-spear/restart.c
@@ -26,7 +26,8 @@ void spear_restart(char mode, const char *cmd)
/* hardware reset, Use on-chip reset capability */
#ifdef CONFIG_ARCH_SPEAR13XX
writel_relaxed(0x01, SPEAR13XX_SYS_SW_RES);
-#else
+#endif
+#if defined(CONFIG_ARCH_SPEAR3XX) || defined(CONFIG_ARCH_SPEAR6XX)
sysctl_soft_reset((void __iomem *)VA_SPEAR_SYS_CTRL_BASE);
#endif
}