summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c64xx/mach-smdk6400.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 14:25:15 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 14:25:27 +0100
commit7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (patch)
treeb835312e76fe323de3e1cbbb0d15fca5a3f7ef9c /arch/arm/mach-s3c64xx/mach-smdk6400.c
parentMerge branch 'devel-stable' into for-linus (diff)
parentARM: 7198/1: arm/imx6: add restart support for imx6q (diff)
downloadlinux-7b9dd47136c07ffd883aff6926c7b281e4c1eea4.tar.xz
linux-7b9dd47136c07ffd883aff6926c7b281e4c1eea4.zip
Merge branch 'restart' into for-linus
Conflicts: arch/arm/mach-exynos/cpu.c The changes to arch/arm/mach-exynos/cpu.c were moved to mach-exynos/common.c.
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-smdk6400.c')
-rw-r--r--arch/arm/mach-s3c64xx/mach-smdk6400.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6400.c b/arch/arm/mach-s3c64xx/mach-smdk6400.c
index be28a59e3f57..5f096534f4c4 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6400.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6400.c
@@ -32,12 +32,13 @@
#include <plat/regs-serial.h>
-#include <plat/s3c6400.h>
#include <plat/clock.h>
#include <plat/devs.h>
#include <plat/cpu.h>
#include <plat/iic.h>
+#include "common.h"
+
#define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK
#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
@@ -93,4 +94,5 @@ MACHINE_START(SMDK6400, "SMDK6400")
.map_io = smdk6400_map_io,
.init_machine = smdk6400_machine_init,
.timer = &s3c24xx_timer,
+ .restart = s3c64xx_restart,
MACHINE_END