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
/
scx200_wdt.c
diff --git
a/drivers/char/watchdog/scx200_wdt.c
b/drivers/char/watchdog/scx200_wdt.c
index
b4a102a
..
fc0e034
100644
(file)
--- a/
drivers/char/watchdog/scx200_wdt.c
+++ b/
drivers/char/watchdog/scx200_wdt.c
@@
-17,7
+17,6
@@
of any nature resulting due to the use of this software. This
software is provided AS-IS with no warranties. */
of any nature resulting due to the use of this software. This
software is provided AS-IS with no warranties. */
-#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>
@@
-167,7
+166,7
@@
static int scx200_wdt_ioctl(struct inode *inode, struct file *file,
switch (cmd) {
default:
switch (cmd) {
default:
- return -ENO
IOCTLCMD
;
+ return -ENO
TTY
;
case WDIOC_GETSUPPORT:
if(copy_to_user(argp, &ident, sizeof(ident)))
return -EFAULT;
case WDIOC_GETSUPPORT:
if(copy_to_user(argp, &ident, sizeof(ident)))
return -EFAULT;
@@
-195,7
+194,7
@@
static int scx200_wdt_ioctl(struct inode *inode, struct file *file,
}
}
}
}
-static struct file_operations scx200_wdt_fops = {
+static
const
struct file_operations scx200_wdt_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = scx200_wdt_write,
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = scx200_wdt_write,