diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 09:26:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 09:26:40 -0800 |
| commit | e2688f00dc0ceb9d9867434dffbd080411fc23b0 (patch) | |
| tree | 433549c6a655ac879654ba82d312911677650380 /include/linux/interrupt.h | |
| parent | [BLOCK] Kill blk_attempt_remerge() (diff) | |
| parent | [BLOCK] CCISS: update for blk softirq completions (diff) | |
| download | linux-dev-e2688f00dc0ceb9d9867434dffbd080411fc23b0.tar.xz linux-dev-e2688f00dc0ceb9d9867434dffbd080411fc23b0.zip | |
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 TIMER_SOFTIRQ, NET_TX_SOFTIRQ, NET_RX_SOFTIRQ, - SCSI_SOFTIRQ, + BLOCK_SOFTIRQ, TASKLET_SOFTIRQ }; |