Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

Conflicts:

	arch/arm/mach-pxa/generic.c
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c
	arch/arm/mach-pxa/pxa2xx.c
	arch/arm/mach-pxa/pxa3xx.c
	arch/arm/mach-pxa/reset.c
	arch/arm/mach-pxa/spitz.c
	arch/arm/mach-pxa/tosa.c
	drivers/watchdog/sa1100_wdt.c

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
index 52a533c274fd..97d9da758dcc 100644
--- a/drivers/watchdog/sa1100_wdt.c
+++ b/drivers/watchdog/sa1100_wdt.c
@@ -31,6 +31,7 @@
 #include <mach/pxa-regs.h>
 #endif
 
+#include <mach/reset.h>
 #include <mach/hardware.h>
 #include <asm/uaccess.h>
 
@@ -162,7 +163,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);