aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-20 11:30:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-20 11:30:01 -0700
commit2453d6ff6ffc5f0d496b7b14f509a26f99bf115e (patch)
tree9e4e709bdb932889b0b9cfc5b2b767cfcf750b83 /kernel
parent12e24f34cb0d55efd08c18b2112507d4bf498008 (diff)
parentab33dcff40d7a9a28587e4425621e4cbc4089e03 (diff)
downloadlinux-2.6.34-ux500-2453d6ff6ffc5f0d496b7b14f509a26f99bf115e.tar.gz
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')
-rw-r--r--kernel/irq/manage.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index aaf5c9d0577..50da6767290 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -856,7 +856,7 @@ EXPORT_SYMBOL(free_irq);
* still called in hard interrupt context and has to check
* whether the interrupt originates from the device. If yes it
* needs to disable the interrupt on the device and return
- * IRQ_THREAD_WAKE which will wake up the handler thread and run
+ * IRQ_WAKE_THREAD which will wake up the handler thread and run
* @thread_fn. This split handler design is necessary to support
* shared interrupts.
*