git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v2.6.34-rc2' into drm-linus
[sfrench/cifs-2.6.git]
/
drivers
/
watchdog
/
wm831x_wdt.c
diff --git
a/drivers/watchdog/wm831x_wdt.c
b/drivers/watchdog/wm831x_wdt.c
index 775bcd807f316fdd46f6ebb3ba69a3bf73d6e9ed..8c4b2d5bb7da542a364d77ac7deb9e8c5a07f1c0 100644
(file)
--- a/
drivers/watchdog/wm831x_wdt.c
+++ b/
drivers/watchdog/wm831x_wdt.c
@@
-213,7
+213,7
@@
static ssize_t wm831x_wdt_write(struct file *file,
return count;
}
-static struct watchdog_info ident = {
+static
const
struct watchdog_info ident = {
.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
.identity = "WM831x Watchdog",
};