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 'davinci-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
drivers
/
watchdog
/
alim1535_wdt.c
diff --git
a/drivers/watchdog/alim1535_wdt.c
b/drivers/watchdog/alim1535_wdt.c
index 937a80fb61e124d96feaf014da38e4b4c194ec3b..1e9caea8ff8a283e87509624dd9ca8fc996f96e2 100644
(file)
--- a/
drivers/watchdog/alim1535_wdt.c
+++ b/
drivers/watchdog/alim1535_wdt.c
@@
-180,7
+180,7
@@
static long ali_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,