projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.35-rc3' into perf/core
[cascardo/linux.git]
/
drivers
/
watchdog
/
alim7101_wdt.c
diff --git
a/drivers/watchdog/alim7101_wdt.c
b/drivers/watchdog/alim7101_wdt.c
index
f90afdb
..
d8d4da9
100644
(file)
--- a/
drivers/watchdog/alim7101_wdt.c
+++ b/
drivers/watchdog/alim7101_wdt.c
@@
-238,7
+238,7
@@
static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
void __user *argp = (void __user *)arg;
int __user *p = argp;
- static struct watchdog_info ident = {
+ static
const
struct watchdog_info ident = {
.options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT
| WDIOF_MAGICCLOSE,
.firmware_version = 1,