aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2440/mach-smdk2440.c
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2012-03-01 13:23:32 +0900
committerKukjin Kim <kgene.kim@samsung.com>2012-03-01 13:23:32 +0900
commitc1ba544f81544ed9613ad5d058968533dbcef4b2 (patch)
tree4c2990910818ad4b1dc112b2eb05cf859cacbfd5 /arch/arm/mach-s3c2440/mach-smdk2440.c
parentc65d8ef2e7158ba521e9cb1ce10ff468b8ddcb6a (diff)
ARM: S3C24XX: Fix restart on S3C2442
Commit b27b072791dc (ARM: 7265/1: restart: S3C24XX: use new restart hook) introduced the new restart hook also for the S3C244x cpus, but it was only defined in the S3C2440 scope, i.e. when CPU_S3C2440 was selected. Devices using the S3C2442 like the GTA02 normally don't select this CPU which leads to compilation errors like: LD .tmp_vmlinux1 arch/arm/mach-s3c2440/built-in.o:(.arch.info.init+0x3c): undefined reference to `s3c2440_restart' make: *** [.tmp_vmlinux1] Error 1 Therefore move the s3c2440_restart function to s3c244x.c which is common to both cpus and also fix the naming to reflect this. Reported-and-tested-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-smdk2440.c')
-rw-r--r--arch/arm/mach-s3c2440/mach-smdk2440.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c
index 1deb60d12a6..83a1036d7dc 100644
--- a/arch/arm/mach-s3c2440/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2440/mach-smdk2440.c
@@ -183,5 +183,5 @@ MACHINE_START(S3C2440, "SMDK2440")
.map_io = smdk2440_map_io,
.init_machine = smdk2440_machine_init,
.timer = &s3c24xx_timer,
- .restart = s3c2440_restart,
+ .restart = s3c244x_restart,
MACHINE_END