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
/
ixp2000_wdt.c
diff --git
a/drivers/char/watchdog/ixp2000_wdt.c
b/drivers/char/watchdog/ixp2000_wdt.c
index
0cfb9b9
..
fd955db
100644
(file)
--- a/
drivers/char/watchdog/ixp2000_wdt.c
+++ b/
drivers/char/watchdog/ixp2000_wdt.c
@@
-1,5
+1,5
@@
/*
/*
- * drivers/watchdog/ixp2000_wdt.c
+ * drivers/
char/
watchdog/ixp2000_wdt.c
*
* Watchdog driver for Intel IXP2000 network processors
*
*
* Watchdog driver for Intel IXP2000 network processors
*
@@
-16,7
+16,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>
@@
-108,7
+107,7
@@
static int
ixp2000_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long arg)
{
ixp2000_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) {
@@
-169,7
+168,7
@@
ixp2000_wdt_release(struct inode *inode, struct file *file)
}
}
-static struct file_operations ixp2000_wdt_fops =
+static
const
struct file_operations ixp2000_wdt_fops =
{
.owner = THIS_MODULE,
.llseek = no_llseek,
{
.owner = THIS_MODULE,
.llseek = no_llseek,