diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:56:36 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:56:43 -0500 |
| commit | 218502bfe674f570205367b9094048207b04ba15 (patch) | |
| tree | c6187b97e7c79d902aef08f049e9fba04c421d56 /kernel/irq/manage.c | |
| parent | 51327ada7142ab520ed610a42572d1f4cbfbb2dc (diff) | |
| parent | 6d83f94db95cfe65d2a6359cccdf61cf087c2598 (diff) | |
Merge branch 'irq/urgent' into irq/core
Reason: Further patches are conflicting with mainline fixes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/manage.c')
| -rw-r--r-- | kernel/irq/manage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 47b2bf10afbc..ba84307fbf24 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -1196,7 +1196,7 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler, | |||
| 1196 | if (retval) | 1196 | if (retval) |
| 1197 | kfree(action); | 1197 | kfree(action); |
| 1198 | 1198 | ||
| 1199 | #ifdef CONFIG_DEBUG_SHIRQ | 1199 | #ifdef CONFIG_DEBUG_SHIRQ_FIXME |
| 1200 | if (!retval && (irqflags & IRQF_SHARED)) { | 1200 | if (!retval && (irqflags & IRQF_SHARED)) { |
| 1201 | /* | 1201 | /* |
| 1202 | * It's a shared IRQ -- the driver ought to be prepared for it | 1202 | * It's a shared IRQ -- the driver ought to be prepared for it |