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
/
eurotechwdt.c
diff --git
a/drivers/char/watchdog/eurotechwdt.c
b/drivers/char/watchdog/eurotechwdt.c
index
25c2f25
..
e228d6e
100644
(file)
--- a/
drivers/char/watchdog/eurotechwdt.c
+++ b/
drivers/char/watchdog/eurotechwdt.c
@@
-40,7
+40,6
@@
* Added Matt Domsch's nowayout module option.
*/
* Added Matt Domsch's nowayout module option.
*/
-#include <linux/config.h>
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
@@
-154,7
+153,7
@@
static void eurwdt_activate_timer(void)
* Kernel methods.
*/
* Kernel methods.
*/
-static irqreturn_t eurwdt_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t eurwdt_interrupt(int irq, void *dev_id)
{
printk(KERN_CRIT "timeout WDT timeout\n");
{
printk(KERN_CRIT "timeout WDT timeout\n");
@@
-241,7
+240,7
@@
static int eurwdt_ioctl(struct inode *inode, struct file *file,
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_GETSUPPORT:
return copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
@@
-357,7
+356,7
@@
static int eurwdt_notify_sys(struct notifier_block *this, unsigned long code,
*/
*/
-static struct file_operations eurwdt_fops = {
+static
const
struct file_operations eurwdt_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = eurwdt_write,
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = eurwdt_write,
@@
-421,7
+420,7
@@
static int __init eurwdt_init(void)
goto out;
}
goto out;
}
- ret = request_irq(irq, eurwdt_interrupt,
SA_INTERRUPT
, "eurwdt", NULL);
+ ret = request_irq(irq, eurwdt_interrupt,
IRQF_DISABLED
, "eurwdt", NULL);
if(ret) {
printk(KERN_ERR "eurwdt: IRQ %d is not free.\n", irq);
goto outmisc;
if(ret) {
printk(KERN_ERR "eurwdt: IRQ %d is not free.\n", irq);
goto outmisc;