projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[powerpc.git]
/
drivers
/
char
/
watchdog
/
mixcomwd.c
diff --git
a/drivers/char/watchdog/mixcomwd.c
b/drivers/char/watchdog/mixcomwd.c
index
c9b301d
..
ae94332
100644
(file)
--- a/
drivers/char/watchdog/mixcomwd.c
+++ b/
drivers/char/watchdog/mixcomwd.c
@@
-37,7
+37,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/miscdevice.h>
#include <linux/ioport.h>
#include <linux/types.h>
#include <linux/miscdevice.h>
#include <linux/ioport.h>
@@
-45,6
+44,8
@@
#include <linux/fs.h>
#include <linux/reboot.h>
#include <linux/init.h>
#include <linux/fs.h>
#include <linux/reboot.h>
#include <linux/init.h>
+#include <linux/jiffies.h>
+#include <linux/timer.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/io.h>
@@
-59,7
+60,7
@@
static unsigned long mixcomwd_opened; /* long req'd for setbit --RR */
static int watchdog_port;
static int mixcomwd_timer_alive;
static int watchdog_port;
static int mixcomwd_timer_alive;
-static
struct timer_list mixcomwd_timer = TIMER_INITIALIZER(
NULL, 0, 0);
+static
DEFINE_TIMER(mixcomwd_timer,
NULL, 0, 0);
static char expect_close;
static int nowayout = WATCHDOG_NOWAYOUT;
static char expect_close;
static int nowayout = WATCHDOG_NOWAYOUT;
@@
-189,7
+190,7
@@
static int mixcomwd_ioctl(struct inode *inode, struct file *file,
return 0;
}
return 0;
}
-static struct file_operations mixcomwd_fops=
+static
const
struct file_operations mixcomwd_fops=
{
.owner = THIS_MODULE,
.llseek = no_llseek,
{
.owner = THIS_MODULE,
.llseek = no_llseek,