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_pci.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_pci.c')
| -rw-r--r-- | drivers/watchdog/pcwd_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c index 698f51bff1bc..64374d636f09 100644 --- a/drivers/watchdog/pcwd_pci.c +++ b/drivers/watchdog/pcwd_pci.c | |||
| @@ -481,7 +481,7 @@ static long pcipcwd_ioctl(struct file *file, unsigned int cmd, | |||
| 481 | { | 481 | { |
| 482 | void __user *argp = (void __user *)arg; | 482 | void __user *argp = (void __user *)arg; |
| 483 | int __user *p = argp; | 483 | int __user *p = argp; |
| 484 | static struct watchdog_info ident = { | 484 | static const struct watchdog_info ident = { |
| 485 | .options = WDIOF_OVERHEAT | | 485 | .options = WDIOF_OVERHEAT | |
| 486 | WDIOF_CARDRESET | | 486 | WDIOF_CARDRESET | |
| 487 | WDIOF_KEEPALIVEPING | | 487 | WDIOF_KEEPALIVEPING | |