diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 12:26:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 12:26:40 -0500 |
| commit | e2688f00dc0ceb9d9867434dffbd080411fc23b0 (patch) | |
| tree | 433549c6a655ac879654ba82d312911677650380 /include/linux/interrupt.h | |
| parent | 356cebea1123804e4aa85b43ab39bbd0ac8e667c (diff) | |
| parent | a9925a06ea52a44b4bf4a941342e8240eaf22417 (diff) | |
Merge branch 'blk-softirq' of git://brick.kernel.dk/data/git/linux-2.6-block
Manual merge for trivial #include changes
Diffstat (limited to 'include/linux/interrupt.h')
| -rw-r--r-- | include/linux/interrupt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index e50a95fbeb11..2c08fdc2bdf7 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h | |||
| @@ -112,7 +112,7 @@ enum | |||
| 112 | TIMER_SOFTIRQ, | 112 | TIMER_SOFTIRQ, |
| 113 | NET_TX_SOFTIRQ, | 113 | NET_TX_SOFTIRQ, |
| 114 | NET_RX_SOFTIRQ, | 114 | NET_RX_SOFTIRQ, |
| 115 | SCSI_SOFTIRQ, | 115 | BLOCK_SOFTIRQ, |
| 116 | TASKLET_SOFTIRQ | 116 | TASKLET_SOFTIRQ |
| 117 | }; | 117 | }; |
| 118 | 118 | ||