git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
char
/
watchdog
/
shwdt.c
diff --git
a/drivers/char/watchdog/shwdt.c
b/drivers/char/watchdog/shwdt.c
index
1f4cab5
..
1355038
100644
(file)
--- a/
drivers/char/watchdog/shwdt.c
+++ b/
drivers/char/watchdog/shwdt.c
@@
-17,7
+17,6
@@
* Added expect close support, made emulated timeout runtime changeable
* general cleanups, add some ioctls
*/
* Added expect close support, made emulated timeout runtime changeable
* general cleanups, add some ioctls
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
@@
-345,7
+344,7
@@
static int sh_wdt_notify_sys(struct notifier_block *this,
return NOTIFY_DONE;
}
return NOTIFY_DONE;
}
-static struct file_operations sh_wdt_fops = {
+static
const
struct file_operations sh_wdt_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = sh_wdt_write,
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = sh_wdt_write,