diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-05 15:39:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-05 15:39:39 -0700 |
| commit | 06d8eb1b7d1eb34c76538dab791bc14136ebbc8f (patch) | |
| tree | 56e8d92422022f7ce97d1b1eb9e2e8de757357d4 /drivers/watchdog/wdt_pci.c | |
| parent | cd3f07d1e6e59fade92a8edaff9315cc534199cf (diff) | |
| parent | 00411ee9308e4b5f4b04caaa01685f955e259373 (diff) | |
Merge git://www.linux-watchdog.org/linux-watchdog
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: Convert wm831x driver to watchdog core
watchdog: s3c2410: convert to use the watchdog framework
Documentation: watchdog: add guide how to convert drivers to new framework
watchdog: iTCO_wdt.c - problems with newer hardware due to SMI clearing
watchdog: Add WDIOC_GETTIMELEFT ioctl support to w83627 watchdog driver
watchdog: irq: Remove IRQF_DISABLED
watchdog: Octeon: Mark octeon_wdt interrupt as IRQF_NO_THREAD
watchdog: sc520_wdt: Remove unnecessary cast.
Diffstat (limited to 'drivers/watchdog/wdt_pci.c')
| -rw-r--r-- | drivers/watchdog/wdt_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c index 172dad6c7693..e0fc3baa9197 100644 --- a/drivers/watchdog/wdt_pci.c +++ b/drivers/watchdog/wdt_pci.c @@ -643,7 +643,7 @@ static int __devinit wdtpci_init_one(struct pci_dev *dev, irq = dev->irq; io = pci_resource_start(dev, 2); - if (request_irq(irq, wdtpci_interrupt, IRQF_DISABLED | IRQF_SHARED, + if (request_irq(irq, wdtpci_interrupt, IRQF_SHARED, "wdt_pci", &wdtpci_miscdev)) { printk(KERN_ERR PFX "IRQ %d is not free\n", irq); goto out_reg; |