diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /block | |
parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-iopoll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c index ca564202ed7a..58916afbbda5 100644 --- a/block/blk-iopoll.c +++ b/block/blk-iopoll.c | |||
@@ -28,7 +28,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_iopoll); | |||
28 | * Description: | 28 | * Description: |
29 | * Add this blk_iopoll structure to the pending poll list and trigger the | 29 | * Add this blk_iopoll structure to the pending poll list and trigger the |
30 | * raise of the blk iopoll softirq. The driver must already have gotten a | 30 | * raise of the blk iopoll softirq. The driver must already have gotten a |
31 | * succesful return from blk_iopoll_sched_prep() before calling this. | 31 | * successful return from blk_iopoll_sched_prep() before calling this. |
32 | **/ | 32 | **/ |
33 | void blk_iopoll_sched(struct blk_iopoll *iop) | 33 | void blk_iopoll_sched(struct blk_iopoll *iop) |
34 | { | 34 | { |