diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/watchdog/machzwd.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/watchdog/machzwd.c')
| -rw-r--r-- | drivers/watchdog/machzwd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/machzwd.c b/drivers/watchdog/machzwd.c index b6b3f59ab446..2d118cf022fc 100644 --- a/drivers/watchdog/machzwd.c +++ b/drivers/watchdog/machzwd.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | * wd#1 - 2 seconds; | 21 | * wd#1 - 2 seconds; |
| 22 | * wd#2 - 7.2 ms; | 22 | * wd#2 - 7.2 ms; |
| 23 | * After the expiration of wd#1, it can generate a NMI, SCI, SMI, or | 23 | * After the expiration of wd#1, it can generate a NMI, SCI, SMI, or |
| 24 | * a system RESET and it starts wd#2 that unconditionaly will RESET | 24 | * a system RESET and it starts wd#2 that unconditionally will RESET |
| 25 | * the system when the counter reaches zero. | 25 | * the system when the counter reaches zero. |
| 26 | * | 26 | * |
| 27 | * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> | 27 | * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> |
| @@ -101,7 +101,7 @@ MODULE_PARM_DESC(nowayout, | |||
| 101 | 101 | ||
| 102 | #define PFX "machzwd" | 102 | #define PFX "machzwd" |
| 103 | 103 | ||
| 104 | static struct watchdog_info zf_info = { | 104 | static const struct watchdog_info zf_info = { |
| 105 | .options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, | 105 | .options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, |
| 106 | .firmware_version = 1, | 106 | .firmware_version = 1, |
| 107 | .identity = "ZF-Logic watchdog", | 107 | .identity = "ZF-Logic watchdog", |