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
/
eurotechwdt.c
diff --git
a/drivers/char/watchdog/eurotechwdt.c
b/drivers/char/watchdog/eurotechwdt.c
index
25c2f25
..
62dbccb
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>
@@
-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;