---

yaml --- r: 108064 b: refs/heads/master c: 214c6a7 h: refs/heads/master v: v3
git-mirror · Aug 5, 2008 · be881b8 · be881b8
1 parent c301b9c
commit be881b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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);