git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
[pandora-kernel.git]
/
drivers
/
char
/
watchdog
/
sbc_epx_c3.c
diff --git
a/drivers/char/watchdog/sbc_epx_c3.c
b/drivers/char/watchdog/sbc_epx_c3.c
index
837b1ec
..
8882b42
100644
(file)
--- a/
drivers/char/watchdog/sbc_epx_c3.c
+++ b/
drivers/char/watchdog/sbc_epx_c3.c
@@
-15,7
+15,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/kernel.h>
#include <linux/fs.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/fs.h>
@@
-142,7
+141,7
@@
static int epx_c3_ioctl(struct inode *inode, struct file *file,
return retval;
default:
return retval;
default:
- return -ENO
IOCTLCMD
;
+ return -ENO
TTY
;
}
}
}
}
@@
-155,7
+154,7
@@
static int epx_c3_notify_sys(struct notifier_block *this, unsigned long code,
return NOTIFY_DONE;
}
return NOTIFY_DONE;
}
-static struct file_operations epx_c3_fops = {
+static
const
struct file_operations epx_c3_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = epx_c3_write,
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = epx_c3_write,