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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
char
/
watchdog
/
wdt.c
diff --git
a/drivers/char/watchdog/wdt.c
b/drivers/char/watchdog/wdt.c
index
ec7e401
..
70be81e
100644
(file)
--- a/
drivers/char/watchdog/wdt.c
+++ b/
drivers/char/watchdog/wdt.c
@@
-31,7
+31,6
@@
* Matt Domsch : Added nowayout module option
*/
* Matt Domsch : Added 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>
@@
-495,7
+494,7
@@
static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
*/
*/
-static struct file_operations wdt_fops = {
+static
const
struct file_operations wdt_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = wdt_write,
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = wdt_write,
@@
-511,7
+510,7
@@
static struct miscdevice wdt_miscdev = {
};
#ifdef CONFIG_WDT_501
};
#ifdef CONFIG_WDT_501
-static struct file_operations wdt_temp_fops = {
+static
const
struct file_operations wdt_temp_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = wdt_temp_read,
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = wdt_temp_read,
@@
-581,7
+580,7
@@
static int __init wdt_init(void)
goto out;
}
goto out;
}
- ret = request_irq(irq, wdt_interrupt,
SA_INTERRUPT
, "wdt501p", NULL);
+ ret = request_irq(irq, wdt_interrupt,
IRQF_DISABLED
, "wdt501p", NULL);
if(ret) {
printk(KERN_ERR "wdt: IRQ %d is not free.\n", irq);
goto outreg;
if(ret) {
printk(KERN_ERR "wdt: IRQ %d is not free.\n", irq);
goto outreg;