diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-20 14:30:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-20 14:30:01 -0400 |
| commit | 2453d6ff6ffc5f0d496b7b14f509a26f99bf115e (patch) | |
| tree | 9e4e709bdb932889b0b9cfc5b2b767cfcf750b83 /kernel/irq | |
| parent | 12e24f34cb0d55efd08c18b2112507d4bf498008 (diff) | |
| parent | ab33dcff40d7a9a28587e4425621e4cbc4089e03 (diff) | |
Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
genirq, irq.h: Fix kernel-doc warnings
genirq: fix comment to say IRQ_WAKE_THREAD
Diffstat (limited to 'kernel/irq')
| -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 aaf5c9d05770..50da67672901 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -856,7 +856,7 @@ EXPORT_SYMBOL(free_irq); | |||
| 856 | * still called in hard interrupt context and has to check | 856 | * still called in hard interrupt context and has to check |
| 857 | * whether the interrupt originates from the device. If yes it | 857 | * whether the interrupt originates from the device. If yes it |
| 858 | * needs to disable the interrupt on the device and return | 858 | * needs to disable the interrupt on the device and return |
| 859 | * IRQ_THREAD_WAKE which will wake up the handler thread and run | 859 | * IRQ_WAKE_THREAD which will wake up the handler thread and run |
| 860 | * @thread_fn. This split handler design is necessary to support | 860 | * @thread_fn. This split handler design is necessary to support |
| 861 | * shared interrupts. | 861 | * shared interrupts. |
| 862 | * | 862 | * |