diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 14:15:50 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 14:15:50 -0400 |
commit | 454abcc57f1d48a976291bc4af73b5f087e21d70 (patch) | |
tree | 5bba999ea3f31527da02b60604531cc5fb52ea57 /include/linux/irq.h | |
parent | 88aab9341a315d81118be6b41c45e4fe32b94bc1 (diff) | |
parent | 6221f222c0ebf1acdf7abcf927178f40e1a65e2a (diff) |
Merge commit 'v2.6.39-rc2' into spi/merge
Diffstat (limited to 'include/linux/irq.h')
-rw-r--r-- | include/linux/irq.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index 2a375a72ce3c..09a308072f56 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
@@ -64,13 +64,6 @@ typedef void (*irq_preflow_handler_t)(struct irq_data *data); | |||
64 | * IRQ_NO_BALANCING - Interrupt cannot be balanced (affinity set) | 64 | * IRQ_NO_BALANCING - Interrupt cannot be balanced (affinity set) |
65 | * IRQ_MOVE_PCNTXT - Interrupt can be migrated from process context | 65 | * IRQ_MOVE_PCNTXT - Interrupt can be migrated from process context |
66 | * IRQ_NESTED_TRHEAD - Interrupt nests into another thread | 66 | * IRQ_NESTED_TRHEAD - Interrupt nests into another thread |
67 | * | ||
68 | * Deprecated bits. They are kept updated as long as | ||
69 | * CONFIG_GENERIC_HARDIRQS_NO_COMPAT is not set. Will go away soon. These bits | ||
70 | * are internal state of the core code and if you really need to acces | ||
71 | * them then talk to the genirq maintainer instead of hacking | ||
72 | * something weird. | ||
73 | * | ||
74 | */ | 67 | */ |
75 | enum { | 68 | enum { |
76 | IRQ_TYPE_NONE = 0x00000000, | 69 | IRQ_TYPE_NONE = 0x00000000, |