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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
char
/
watchdog
/
wdt_pci.c
diff --git
a/drivers/char/watchdog/wdt_pci.c
b/drivers/char/watchdog/wdt_pci.c
index
5918ca2
..
4b33119
100644
(file)
--- a/
drivers/char/watchdog/wdt_pci.c
+++ b/
drivers/char/watchdog/wdt_pci.c
@@
-35,6
+35,7
@@
* Matt Domsch : nowayout module option
*/
* Matt Domsch : 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>
@@
-543,7
+544,7
@@
static int wdtpci_notify_sys(struct notifier_block *this, unsigned long code,
*/
*/
-static
const
struct file_operations wdtpci_fops = {
+static struct file_operations wdtpci_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = wdtpci_write,
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = wdtpci_write,
@@
-559,7
+560,7
@@
static struct miscdevice wdtpci_miscdev = {
};
#ifdef CONFIG_WDT_501_PCI
};
#ifdef CONFIG_WDT_501_PCI
-static
const
struct file_operations wdtpci_temp_fops = {
+static struct file_operations wdtpci_temp_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = wdtpci_temp_read,
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = wdtpci_temp_read,
@@
-617,7
+618,7
@@
static int __devinit wdtpci_init_one (struct pci_dev *dev,
goto out_pci;
}
goto out_pci;
}
- if (request_irq (irq, wdtpci_interrupt,
IRQF_DISABLED | IRQF_SHARED
,
+ if (request_irq (irq, wdtpci_interrupt,
SA_INTERRUPT | SA_SHIRQ
,
"wdt_pci", &wdtpci_miscdev)) {
printk (KERN_ERR PFX "IRQ %d is not free\n", irq);
goto out_reg;
"wdt_pci", &wdtpci_miscdev)) {
printk (KERN_ERR PFX "IRQ %d is not free\n", irq);
goto out_reg;