projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux...
[powerpc.git]
/
drivers
/
char
/
watchdog
/
sc520_wdt.c
diff --git
a/drivers/char/watchdog/sc520_wdt.c
b/drivers/char/watchdog/sc520_wdt.c
index
72501be
..
caec37b
100644
(file)
--- a/
drivers/char/watchdog/sc520_wdt.c
+++ b/
drivers/char/watchdog/sc520_wdt.c
@@
-63,6
+63,7
@@
#include <linux/notifier.h>
#include <linux/reboot.h>
#include <linux/init.h>
#include <linux/notifier.h>
#include <linux/reboot.h>
#include <linux/init.h>
+#include <linux/jiffies.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/uaccess.h>
@@
-289,7
+290,7
@@
static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
switch(cmd)
{
default:
switch(cmd)
{
default:
- return -ENO
IOCTLCMD
;
+ return -ENO
TTY
;
case WDIOC_GETSUPPORT:
return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0;
case WDIOC_GETSTATUS:
case WDIOC_GETSUPPORT:
return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0;
case WDIOC_GETSTATUS:
@@
-335,7
+336,7
@@
static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
}
}
}
}
-static struct file_operations wdt_fops = {
+static
const
struct file_operations wdt_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = fop_write,
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = fop_write,