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 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
watchdog
/
pc87413_wdt.c
diff --git
a/drivers/watchdog/pc87413_wdt.c
b/drivers/watchdog/pc87413_wdt.c
index 1a2b916e3f8d0481855770b9437482ec25fd6381..d3aa2f1fe61db4152cd51d0202dbc1b7f19dacad 100644
(file)
--- a/
drivers/watchdog/pc87413_wdt.c
+++ b/
drivers/watchdog/pc87413_wdt.c
@@
-407,7
+407,7
@@
static long pc87413_ioctl(struct file *file, unsigned int cmd,
int __user *i;
} uarg;
- static struct watchdog_info ident = {
+ static
const
struct watchdog_info ident = {
.options = WDIOF_KEEPALIVEPING |
WDIOF_SETTIMEOUT |
WDIOF_MAGICCLOSE,