diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
| commit | 0a0e9ae1bd788bc19adc4d4ae08c98b233697402 (patch) | |
| tree | 13825eeb5bbeae27d66e95f12168eff4b60701ab /kernel/irq/manage.c | |
| parent | 01a16b21d6adf992aa863186c3c4e561a57c1714 (diff) | |
| parent | b65a0e0c84cf489bfa00d6aa6c48abc5a237100f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
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 0587c5ceaed8..094fafe86c96 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -1182,7 +1182,7 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler, | |||
| 1182 | if (retval) | 1182 | if (retval) |
| 1183 | kfree(action); | 1183 | kfree(action); |
| 1184 | 1184 | ||
| 1185 | #ifdef CONFIG_DEBUG_SHIRQ | 1185 | #ifdef CONFIG_DEBUG_SHIRQ_FIXME |
| 1186 | if (!retval && (irqflags & IRQF_SHARED)) { | 1186 | if (!retval && (irqflags & IRQF_SHARED)) { |
| 1187 | /* | 1187 | /* |
| 1188 | * It's a shared IRQ -- the driver ought to be prepared for it | 1188 | * It's a shared IRQ -- the driver ought to be prepared for it |