projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[powerpc.git]
/
drivers
/
char
/
watchdog
/
rm9k_wdt.c
diff --git
a/drivers/char/watchdog/rm9k_wdt.c
b/drivers/char/watchdog/rm9k_wdt.c
index
b467883
..
5c921e4
100644
(file)
--- a/
drivers/char/watchdog/rm9k_wdt.c
+++ b/
drivers/char/watchdog/rm9k_wdt.c
@@
-192,7
+192,7
@@
static int wdt_gpi_open(struct inode *inode, struct file *file)
locked = 0;
}
- res = request_irq(wd_irq, wdt_gpi_irqhdl,
SA_SHIRQ | SA_INTERRUPT
,
+ res = request_irq(wd_irq, wdt_gpi_irqhdl,
IRQF_SHARED | IRQF_DISABLED
,
wdt_gpi_name, &miscdev);
if (unlikely(res))
return res;