diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
| commit | b4b7a4ef097f288f724420b473dbf92a89c0ab7e (patch) | |
| tree | 23ad8101e3e77c32a8d1e1b95a9c1cd7f7a475b7 /drivers/watchdog/acquirewdt.c | |
| parent | e9ce335df51ff782035a15c261a3c0c9892a1767 (diff) | |
| parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) | |
Merge branch 'master' into for-linus
Conflicts:
block/Kconfig
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/watchdog/acquirewdt.c')
| -rw-r--r-- | drivers/watchdog/acquirewdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c index 4d18c874d963..2ffce4d75443 100644 --- a/drivers/watchdog/acquirewdt.c +++ b/drivers/watchdog/acquirewdt.c | |||
| @@ -150,7 +150,7 @@ static long acq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
| 150 | int options, retval = -EINVAL; | 150 | int options, retval = -EINVAL; |
| 151 | void __user *argp = (void __user *)arg; | 151 | void __user *argp = (void __user *)arg; |
| 152 | int __user *p = argp; | 152 | int __user *p = argp; |
| 153 | static struct watchdog_info ident = { | 153 | static const struct watchdog_info ident = { |
| 154 | .options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, | 154 | .options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, |
| 155 | .firmware_version = 1, | 155 | .firmware_version = 1, |
| 156 | .identity = WATCHDOG_NAME, | 156 | .identity = WATCHDOG_NAME, |