From f81b4d025fd7d4467e2160d1c18924ed25f6d1a0 Mon Sep 17 00:00:00 2001
From: Jemings Ko <jemings@samsung.com>
Date: Mon, 20 Sep 2010 15:33:04 +0900
Subject: [PATCH] --- yaml --- r: 221069 b: refs/heads/master c:
 8d75c9128a07bd1f81952a518ed818d1a3e90c96 h: refs/heads/master i:   221067:
 794bfcae4795b5d066dd97f1df793d3cd1ea995c v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/arm/Kconfig                      | 1 +
 trunk/arch/arm/mach-s5pv310/Kconfig         | 2 ++
 trunk/arch/arm/mach-s5pv310/mach-smdkc210.c | 1 +
 trunk/arch/arm/mach-s5pv310/mach-smdkv310.c | 1 +
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index aa8eb5b24e53..44252af2872f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdff6e6fd2d4360e2d5bc39afe3f1ef17d79dbf0
+refs/heads/master: 8d75c9128a07bd1f81952a518ed818d1a3e90c96
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 83b4b0858bf6..fe3cf37c5dd5 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -734,6 +734,7 @@ config ARCH_S5PV310
 	select HAVE_CLK
 	select GENERIC_CLOCKEVENTS
 	select HAVE_S3C_RTC
+	select HAVE_S3C2410_WATCHDOG
 	help
 	  Samsung S5PV310 series based systems
 
diff --git a/trunk/arch/arm/mach-s5pv310/Kconfig b/trunk/arch/arm/mach-s5pv310/Kconfig
index 4de5d7265a9f..1d59ce9701c8 100644
--- a/trunk/arch/arm/mach-s5pv310/Kconfig
+++ b/trunk/arch/arm/mach-s5pv310/Kconfig
@@ -34,6 +34,7 @@ config MACH_SMDKC210
 	select CPU_S5PV310
 	select ARCH_SPARSEMEM_ENABLE
 	select S3C_DEV_RTC
+	select S3C_DEV_WDT
 	help
 	  Machine support for Samsung SMDKC210
 	  S5PC210(MCP) is one of package option of S5PV310
@@ -55,6 +56,7 @@ config MACH_SMDKV310
 	select CPU_S5PV310
 	select ARCH_SPARSEMEM_ENABLE
 	select S3C_DEV_RTC
+	select S3C_DEV_WDT
 	help
 	  Machine support for Samsung SMDKV310
 
diff --git a/trunk/arch/arm/mach-s5pv310/mach-smdkc210.c b/trunk/arch/arm/mach-s5pv310/mach-smdkc210.c
index 9464084cc1f7..b0623976b884 100644
--- a/trunk/arch/arm/mach-s5pv310/mach-smdkc210.c
+++ b/trunk/arch/arm/mach-s5pv310/mach-smdkc210.c
@@ -68,6 +68,7 @@ static struct s3c2410_uartcfg smdkc210_uartcfgs[] __initdata = {
 
 static struct platform_device *smdkc210_devices[] __initdata = {
 	&s3c_device_rtc,
+	&s3c_device_wdt,
 };
 
 static void __init smdkc210_map_io(void)
diff --git a/trunk/arch/arm/mach-s5pv310/mach-smdkv310.c b/trunk/arch/arm/mach-s5pv310/mach-smdkv310.c
index 06062c8e337c..9cb827da97f5 100644
--- a/trunk/arch/arm/mach-s5pv310/mach-smdkv310.c
+++ b/trunk/arch/arm/mach-s5pv310/mach-smdkv310.c
@@ -68,6 +68,7 @@ static struct s3c2410_uartcfg smdkv310_uartcfgs[] __initdata = {
 
 static struct platform_device *smdkv310_devices[] __initdata = {
 	&s3c_device_rtc,
+	&s3c_device_wdt,
 };
 
 static void __init smdkv310_map_io(void)