git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream/jump-label-noearly' of git://git.kernel.org/pub/scm/linux...
[pandora-kernel.git]
/
drivers
/
watchdog
/
wdt.c
diff --git
a/drivers/watchdog/wdt.c
b/drivers/watchdog/wdt.c
index
bb03e15
..
d2ef002
100644
(file)
--- a/
drivers/watchdog/wdt.c
+++ b/
drivers/watchdog/wdt.c
@@
-612,7
+612,7
@@
static int __init wdt_init(void)
goto out;
}
goto out;
}
- ret = request_irq(irq, wdt_interrupt,
IRQF_DISABLED
, "wdt501p", NULL);
+ ret = request_irq(irq, wdt_interrupt,
0
, "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;