summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds2011-06-08 04:21:11 +0200
committerLinus Torvalds2011-06-08 04:21:11 +0200
commitcb0a02ecf95e5f47d92e7d4c513cc1f7aeb40cda (patch)
tree3e9b2341855a1b5ddac5f0edb74a679111f8a350 /include
parentMerge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentgenirq: Ensure we locate the passed IRQ in irq_alloc_descs() (diff)
downloadkernel-qcow2-linux-cb0a02ecf95e5f47d92e7d4c513cc1f7aeb40cda.tar.gz
kernel-qcow2-linux-cb0a02ecf95e5f47d92e7d4c513cc1f7aeb40cda.tar.xz
kernel-qcow2-linux-cb0a02ecf95e5f47d92e7d4c513cc1f7aeb40cda.zip
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: Ensure we locate the passed IRQ in irq_alloc_descs() genirq: Fix descriptor init on non-sparse IRQs irq: Handle spurios irq detection for threaded irqs genirq: Print threaded handler in spurious debug output
Diffstat (limited to 'include')
-rw-r--r--include/linux/irqreturn.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/irqreturn.h b/include/linux/irqreturn.h
index 819acaaac3f5..714ba08dc092 100644
--- a/include/linux/irqreturn.h
+++ b/include/linux/irqreturn.h
@@ -8,9 +8,9 @@
* @IRQ_WAKE_THREAD handler requests to wake the handler thread
*/
enum irqreturn {
- IRQ_NONE,
- IRQ_HANDLED,
- IRQ_WAKE_THREAD,
+ IRQ_NONE = (0 << 0),
+ IRQ_HANDLED = (1 << 0),
+ IRQ_WAKE_THREAD = (1 << 1),
};
typedef enum irqreturn irqreturn_t;