diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-03 09:17:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-03 09:17:01 +0200 |
| commit | 53ba4f2fa73225113a488584df0d85d3cba52943 (patch) | |
| tree | d85b984d9818abc3ccc0237eb53b710d9e96c39e /drivers/watchdog/indydog.c | |
| parent | lockstat: Make lockstat counting per cpu (diff) | |
| parent | Linux 2.6.34-rc6 (diff) | |
| download | linux-53ba4f2fa73225113a488584df0d85d3cba52943.tar.xz linux-53ba4f2fa73225113a488584df0d85d3cba52943.zip | |
Merge commit 'v2.6.34-rc6' into core/locking
Diffstat (limited to 'drivers/watchdog/indydog.c')
| -rw-r--r-- | drivers/watchdog/indydog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/indydog.c b/drivers/watchdog/indydog.c index bea8a124a559..1cc5609666d1 100644 --- a/drivers/watchdog/indydog.c +++ b/drivers/watchdog/indydog.c @@ -111,7 +111,7 @@ static long indydog_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { int options, retval = -EINVAL; - static struct watchdog_info ident = { + static const struct watchdog_info ident = { .options = WDIOF_KEEPALIVEPING, .firmware_version = 0, .identity = "Hardware Watchdog for SGI IP22", |