git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
drivers
/
char
/
watchdog
/
omap_wdt.c
diff --git
a/drivers/char/watchdog/omap_wdt.c
b/drivers/char/watchdog/omap_wdt.c
index
5dbd7dc
..
84074a6
100644
(file)
--- a/
drivers/char/watchdog/omap_wdt.c
+++ b/
drivers/char/watchdog/omap_wdt.c
@@
-230,7
+230,7
@@
omap_wdt_ioctl(struct inode *inode, struct file *file,
}
}
}
}
-static struct file_operations omap_wdt_fops = {
+static
const
struct file_operations omap_wdt_fops = {
.owner = THIS_MODULE,
.write = omap_wdt_write,
.ioctl = omap_wdt_ioctl,
.owner = THIS_MODULE,
.write = omap_wdt_write,
.ioctl = omap_wdt_ioctl,
@@
-290,7
+290,7
@@
static int __init omap_wdt_probe(struct platform_device *pdev)
omap_wdt_disable();
omap_wdt_adjust_timeout(timer_margin);
omap_wdt_disable();
omap_wdt_adjust_timeout(timer_margin);
- omap_wdt_miscdev.
dev
= &pdev->dev;
+ omap_wdt_miscdev.
parent
= &pdev->dev;
ret = misc_register(&omap_wdt_miscdev);
if (ret)
goto fail;
ret = misc_register(&omap_wdt_miscdev);
if (ret)
goto fail;