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/pcwd.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/watchdog/pcwd.c')
| -rw-r--r-- | drivers/watchdog/pcwd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/pcwd.c b/drivers/watchdog/pcwd.c index aa9512321f3a..06f7922606c0 100644 --- a/drivers/watchdog/pcwd.c +++ b/drivers/watchdog/pcwd.c | |||
| @@ -606,7 +606,7 @@ static long pcwd_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
| 606 | int temperature; | 606 | int temperature; |
| 607 | int new_heartbeat; | 607 | int new_heartbeat; |
| 608 | int __user *argp = (int __user *)arg; | 608 | int __user *argp = (int __user *)arg; |
| 609 | static struct watchdog_info ident = { | 609 | static const struct watchdog_info ident = { |
| 610 | .options = WDIOF_OVERHEAT | | 610 | .options = WDIOF_OVERHEAT | |
| 611 | WDIOF_CARDRESET | | 611 | WDIOF_CARDRESET | |
| 612 | WDIOF_KEEPALIVEPING | | 612 | WDIOF_KEEPALIVEPING | |