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
/
ixp4xx_wdt.c
diff --git
a/drivers/char/watchdog/ixp4xx_wdt.c
b/drivers/char/watchdog/ixp4xx_wdt.c
index
3800835
..
5864bb8
100644
(file)
--- a/
drivers/char/watchdog/ixp4xx_wdt.c
+++ b/
drivers/char/watchdog/ixp4xx_wdt.c
@@
-1,5
+1,5
@@
/*
/*
- * drivers/watchdog/ixp4xx_wdt.c
+ * drivers/
char/
watchdog/ixp4xx_wdt.c
*
* Watchdog driver for Intel IXP4xx network processors
*
*
* Watchdog driver for Intel IXP4xx network processors
*
@@
-13,7
+13,6
@@
* warranty of any kind, whether express or implied.
*/
* warranty of any kind, whether express or implied.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/types.h>
@@
-103,7
+102,7
@@
static int
ixp4xx_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long arg)
{
ixp4xx_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long arg)
{
- int ret = -ENO
IOCTLCMD
;
+ int ret = -ENO
TTY
;
int time;
switch (cmd) {
int time;
switch (cmd) {
@@
-163,7
+162,7
@@
ixp4xx_wdt_release(struct inode *inode, struct file *file)
}
}
-static struct file_operations ixp4xx_wdt_fops =
+static
const
struct file_operations ixp4xx_wdt_fops =
{
.owner = THIS_MODULE,
.llseek = no_llseek,
{
.owner = THIS_MODULE,
.llseek = no_llseek,