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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
char
/
watchdog
/
sa1100_wdt.c
diff --git
a/drivers/char/watchdog/sa1100_wdt.c
b/drivers/char/watchdog/sa1100_wdt.c
index
522a937
..
33c1137
100644
(file)
--- a/
drivers/char/watchdog/sa1100_wdt.c
+++ b/
drivers/char/watchdog/sa1100_wdt.c
@@
-17,7
+17,6
@@
*
* 27/11/2000 Initial release
*/
*
* 27/11/2000 Initial release
*/
-#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>
@@
-91,7
+90,7
@@
static struct watchdog_info ident = {
static int sa1100dog_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
static int sa1100dog_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
- int ret = -ENO
IOCTLCMD
;
+ int ret = -ENO
TTY
;
int time;
void __user *argp = (void __user *)arg;
int __user *p = argp;
int time;
void __user *argp = (void __user *)arg;
int __user *p = argp;
@@
-136,7
+135,7
@@
static int sa1100dog_ioctl(struct inode *inode, struct file *file,
return ret;
}
return ret;
}
-static struct file_operations sa1100dog_fops =
+static
const
struct file_operations sa1100dog_fops =
{
.owner = THIS_MODULE,
.llseek = no_llseek,
{
.owner = THIS_MODULE,
.llseek = no_llseek,