diff options
| author | Colin Cross <ccross@android.com> | 2011-03-03 17:17:49 -0500 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-03-03 17:17:49 -0500 |
| commit | c871fe663a6368fd0e98f5a3bfd81b0b9c591266 (patch) | |
| tree | d09c244e94c09f985caf259c434c7eda8ff53229 /kernel/irq/manage.c | |
| parent | d5fdafd38ca0c28c4648909ce0afd0a5420309ca (diff) | |
| parent | db811ca0f48578f9940f49f284ac81e336b264ad (diff) | |
Merge branch 'for-2639/i2c/i2c-tegra' of git://git.fluff.org/bjdooks/linux into for-next-i2c
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 0caa59f747dd..9033c1c70828 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -1100,7 +1100,7 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler, | |||
| 1100 | if (retval) | 1100 | if (retval) |
| 1101 | kfree(action); | 1101 | kfree(action); |
| 1102 | 1102 | ||
| 1103 | #ifdef CONFIG_DEBUG_SHIRQ | 1103 | #ifdef CONFIG_DEBUG_SHIRQ_FIXME |
| 1104 | if (!retval && (irqflags & IRQF_SHARED)) { | 1104 | if (!retval && (irqflags & IRQF_SHARED)) { |
| 1105 | /* | 1105 | /* |
| 1106 | * It's a shared IRQ -- the driver ought to be prepared for it | 1106 | * It's a shared IRQ -- the driver ought to be prepared for it |