From 243db70f7a0e68e4331641c50cd7bdbc2eefe4a1 Mon Sep 17 00:00:00 2001 From: Banajit Goswami Date: Thu, 20 May 2010 16:21:31 +0900 Subject: [PATCH] --- yaml --- r: 198509 b: refs/heads/master c: a0cce45581d1857b057f674ff118197392031559 h: refs/heads/master i: 198507: 3a5c4c9eca254b4c9c41f03a7075b22879a8e4c5 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s5p6440/Kconfig | 2 ++ trunk/arch/arm/mach-s5p6440/include/mach/map.h | 1 + trunk/arch/arm/mach-s5p6440/mach-smdk6440.c | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 70de7c9125c1..bc0c68948620 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b351c4a178f538d42b907b90bc6a60bb221fbaae +refs/heads/master: a0cce45581d1857b057f674ff118197392031559 diff --git a/trunk/arch/arm/mach-s5p6440/Kconfig b/trunk/arch/arm/mach-s5p6440/Kconfig index 77aeffd17330..d34eda127091 100644 --- a/trunk/arch/arm/mach-s5p6440/Kconfig +++ b/trunk/arch/arm/mach-s5p6440/Kconfig @@ -16,6 +16,8 @@ config CPU_S5P6440 config MACH_SMDK6440 bool "SMDK6440" select CPU_S5P6440 + select S3C_DEV_WDT + select HAVE_S3C2410_WATCHDOG help Machine support for the Samsung SMDK6440 diff --git a/trunk/arch/arm/mach-s5p6440/include/mach/map.h b/trunk/arch/arm/mach-s5p6440/include/mach/map.h index 72aedadd412c..049f1b93ce2e 100644 --- a/trunk/arch/arm/mach-s5p6440/include/mach/map.h +++ b/trunk/arch/arm/mach-s5p6440/include/mach/map.h @@ -72,5 +72,6 @@ /* compatibiltiy defines. */ #define S3C_PA_UART S5P6440_PA_UART #define S3C_PA_IIC S5P6440_PA_IIC0 +#define S3C_PA_WDT S5P6440_PA_WDT #endif /* __ASM_ARCH_MAP_H */ diff --git a/trunk/arch/arm/mach-s5p6440/mach-smdk6440.c b/trunk/arch/arm/mach-s5p6440/mach-smdk6440.c index d7fede971ca6..af6abc6b749f 100644 --- a/trunk/arch/arm/mach-s5p6440/mach-smdk6440.c +++ b/trunk/arch/arm/mach-s5p6440/mach-smdk6440.c @@ -85,6 +85,7 @@ static struct s3c2410_uartcfg smdk6440_uartcfgs[] __initdata = { static struct platform_device *smdk6440_devices[] __initdata = { &s5p6440_device_iis, + &s3c_device_wdt, }; static void __init smdk6440_map_io(void)