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/mixcomwd.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/watchdog/mixcomwd.c')
| -rw-r--r-- | drivers/watchdog/mixcomwd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/mixcomwd.c b/drivers/watchdog/mixcomwd.c index 407b025cb104..bc820d16699a 100644 --- a/drivers/watchdog/mixcomwd.c +++ b/drivers/watchdog/mixcomwd.c | |||
| @@ -201,7 +201,7 @@ static long mixcomwd_ioctl(struct file *file, | |||
| 201 | void __user *argp = (void __user *)arg; | 201 | void __user *argp = (void __user *)arg; |
| 202 | int __user *p = argp; | 202 | int __user *p = argp; |
| 203 | int status; | 203 | int status; |
| 204 | static struct watchdog_info ident = { | 204 | static const struct watchdog_info ident = { |
| 205 | .options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, | 205 | .options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, |
| 206 | .firmware_version = 1, | 206 | .firmware_version = 1, |
| 207 | .identity = "MixCOM watchdog", | 207 | .identity = "MixCOM watchdog", |