git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB: uvcvideo: Add support for Packard Bell EasyNote MX52 integrated webcam
[safe/jmp/linux-2.6]
/
drivers
/
watchdog
/
cpwd.c
diff --git
a/drivers/watchdog/cpwd.c
b/drivers/watchdog/cpwd.c
index
0c14586
..
ba2efce
100644
(file)
--- a/
drivers/watchdog/cpwd.c
+++ b/
drivers/watchdog/cpwd.c
@@
-24,14
+24,14
@@
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <linux/timer.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <linux/timer.h>
+#include <linux/slab.h>
#include <linux/smp_lock.h>
#include <linux/io.h>
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/smp_lock.h>
#include <linux/io.h>
#include <linux/of.h>
#include <linux/of_device.h>
+#include <linux/uaccess.h>
#include <asm/irq.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
-
#include <asm/watchdog.h>
#define DRIVER_NAME "cpwd"
#include <asm/watchdog.h>
#define DRIVER_NAME "cpwd"
@@
-155,9
+155,9
@@
static struct cpwd *cpwd_device;
static struct timer_list cpwd_timer;
static struct timer_list cpwd_timer;
-static int wd0_timeout
= 0
;
-static int wd1_timeout
= 0
;
-static int wd2_timeout
= 0
;
+static int wd0_timeout;
+static int wd1_timeout;
+static int wd2_timeout;
module_param(wd0_timeout, int, 0);
MODULE_PARM_DESC(wd0_timeout, "Default watchdog0 timeout in 1/10secs");
module_param(wd0_timeout, int, 0);
MODULE_PARM_DESC(wd0_timeout, "Default watchdog0 timeout in 1/10secs");
@@
-404,7
+404,7
@@
static int cpwd_release(struct inode *inode, struct file *file)
static long cpwd_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
static long cpwd_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
- static struct watchdog_info info = {
+ static
const
struct watchdog_info info = {
.options = WDIOF_SETTIMEOUT,
.firmware_version = 1,
.identity = DRIVER_NAME,
.options = WDIOF_SETTIMEOUT,
.firmware_version = 1,
.identity = DRIVER_NAME,