diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 11:05:25 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 11:06:47 +0100 |
| commit | afd2fc02ab7bae6062671c5ca80dd34c34a63fb7 (patch) | |
| tree | 6048ce3ba252a95ac2195b680caa2b55c384073e /drivers | |
| parent | 1f4de5a0e3b4a4b8afa2cddb46429d32e1053c14 (diff) | |
| parent | 214c6a7ed13e01cab2addeef56124067e4d20147 (diff) | |
| download | talos-obmc-linux-afd2fc02ab7bae6062671c5ca80dd34c34a63fb7.tar.gz talos-obmc-linux-afd2fc02ab7bae6062671c5ca80dd34c34a63fb7.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/sa1100_wdt.c | 4 |
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); |
