projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
[deliverable/linux.git]
/
drivers
/
watchdog
/
sa1100_wdt.c
diff --git
a/drivers/watchdog/sa1100_wdt.c
b/drivers/watchdog/sa1100_wdt.c
index 52a533c274fdda2afc785e00af1af6f76ffa7637..97d9da758dccd7a0977ffea9d93ec0938f4b749b 100644
(file)
--- a/
drivers/watchdog/sa1100_wdt.c
+++ b/
drivers/watchdog/sa1100_wdt.c
@@
-31,6
+31,7
@@
#include <mach/pxa-regs.h>
#endif
#include <mach/pxa-regs.h>
#endif
+#include <mach/reset.h>
#include <mach/hardware.h>
#include <asm/uaccess.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.
*/
* 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);
pre_margin = OSCR_FREQ * margin;
ret = misc_register(&sa1100dog_miscdev);
This page took
0.031282 seconds
and
5
git commands to generate.