From be881b8c7963b505a54c9d93d14e3500a0166984 Mon Sep 17 00:00:00 2001
From: Eric Miao <eric.miao@marvell.com>
Date: Tue, 29 Jul 2008 14:39:34 +0800
Subject: [PATCH] --- yaml --- r: 108064 b: refs/heads/master c:
 214c6a7ed13e01cab2addeef56124067e4d20147 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/watchdog/sa1100_wdt.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b6a8e1f4d25a..8f30c0e09080 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04fef228fb00dd79475a2313f4ba73b4fbfe2faa
+refs/heads/master: 214c6a7ed13e01cab2addeef56124067e4d20147
diff --git a/trunk/drivers/watchdog/sa1100_wdt.c b/trunk/drivers/watchdog/sa1100_wdt.c
index 34a2b3b81800..e42002d2f815 100644
--- a/trunk/drivers/watchdog/sa1100_wdt.c
+++ b/trunk/drivers/watchdog/sa1100_wdt.c
@@ -31,6 +31,8 @@
 #include <asm/arch/pxa-regs.h>
 #endif
 
+#include <asm/arch/reset.h>
+
 #include <asm/hardware.h>
 #include <asm/uaccess.h>
 
@@ -162,7 +164,8 @@ static int __init sa1100dog_init(void)
 	 * we suspend, RCSR will be cleared, and the watchdog
 	 * reset reason will be lost.
 	 */
-	boot_status = (RCSR & RCSR_WDR) ? WDIOF_CARDRESET : 0;
+	boot_status = (reset_status & RESET_STATUS_WATCHDOG) ?
+				WDIOF_CARDRESET : 0;
 	pre_margin = OSCR_FREQ * margin;
 
 	ret = misc_register(&sa1100dog_miscdev);