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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
char
/
watchdog
/
mpc83xx_wdt.c
diff --git
a/drivers/char/watchdog/mpc83xx_wdt.c
b/drivers/char/watchdog/mpc83xx_wdt.c
index
5d6f506
..
18ca752
100644
(file)
--- a/
drivers/char/watchdog/mpc83xx_wdt.c
+++ b/
drivers/char/watchdog/mpc83xx_wdt.c
@@
-15,7
+15,6
@@
* option) any later version.
*/
* option) any later version.
*/
-#include <linux/config.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/kernel.h>
@@
-126,11
+125,11
@@
static int mpc83xx_wdt_ioctl(struct inode *inode, struct file *file,
case WDIOC_GETTIMEOUT:
return put_user(timeout_sec, p);
default:
case WDIOC_GETTIMEOUT:
return put_user(timeout_sec, p);
default:
- return -ENO
IOCTLCMD
;
+ return -ENO
TTY
;
}
}
}
}
-static struct file_operations mpc83xx_wdt_fops = {
+static
const
struct file_operations mpc83xx_wdt_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = mpc83xx_wdt_write,
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = mpc83xx_wdt_write,