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 kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
char
/
watchdog
/
softdog.c
diff --git
a/drivers/char/watchdog/softdog.c
b/drivers/char/watchdog/softdog.c
index
a91edaf
..
4067e1f
100644
(file)
--- a/
drivers/char/watchdog/softdog.c
+++ b/
drivers/char/watchdog/softdog.c
@@
-38,7
+38,6
@@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/timer.h>
#include <linux/miscdevice.h>
#include <linux/types.h>
#include <linux/timer.h>
#include <linux/miscdevice.h>
@@
-204,7
+203,7
@@
static int softdog_ioctl(struct inode *inode, struct file *file,
};
switch (cmd) {
default:
};
switch (cmd) {
default:
- return -ENO
IOCTLCMD
;
+ return -ENO
TTY
;
case WDIOC_GETSUPPORT:
return copy_to_user(argp, &ident,
sizeof(ident)) ? -EFAULT : 0;
case WDIOC_GETSUPPORT:
return copy_to_user(argp, &ident,
sizeof(ident)) ? -EFAULT : 0;
@@
-244,7
+243,7
@@
static int softdog_notify_sys(struct notifier_block *this, unsigned long code,
* Kernel Interfaces
*/
* Kernel Interfaces
*/
-static struct file_operations softdog_fops = {
+static
const
struct file_operations softdog_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = softdog_write,
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = softdog_write,