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 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
drivers
/
watchdog
/
octeon-wdt-main.c
diff --git
a/drivers/watchdog/octeon-wdt-main.c
b/drivers/watchdog/octeon-wdt-main.c
index
945ee83
..
7c0d863
100644
(file)
--- a/
drivers/watchdog/octeon-wdt-main.c
+++ b/
drivers/watchdog/octeon-wdt-main.c
@@
-402,7
+402,7
@@
static void octeon_wdt_setup_interrupt(int cpu)
irq = OCTEON_IRQ_WDOG0 + core;
if (request_irq(irq, octeon_wdt_poke_irq,
irq = OCTEON_IRQ_WDOG0 + core;
if (request_irq(irq, octeon_wdt_poke_irq,
- IRQF_
DISABLE
D, "octeon_wdt", octeon_wdt_poke_irq))
+ IRQF_
NO_THREA
D, "octeon_wdt", octeon_wdt_poke_irq))
panic("octeon_wdt: Couldn't obtain irq %d", irq);
cpumask_set_cpu(cpu, &irq_enabled_cpus);
panic("octeon_wdt: Couldn't obtain irq %d", irq);
cpumask_set_cpu(cpu, &irq_enabled_cpus);