diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-06-17 20:04:18 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-06-17 20:04:18 -0400 |
| commit | 3afa294c40013be5d8180005002e3f648d04d942 (patch) | |
| tree | 8a8b7464fd8ee4901288afb3e9e8d761ef45647d /include/linux/blkdev.h | |
| parent | a1541d5af66d02426655b1498f814c52347dd7d3 (diff) | |
| parent | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (diff) | |
merge by hand (qla_os.c mismerge)
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index ef1afc178c0a..4a99b76c5a33 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -544,7 +544,7 @@ extern void blk_end_sync_rq(struct request *rq); | |||
| 544 | extern void blk_attempt_remerge(request_queue_t *, struct request *); | 544 | extern void blk_attempt_remerge(request_queue_t *, struct request *); |
| 545 | extern void __blk_attempt_remerge(request_queue_t *, struct request *); | 545 | extern void __blk_attempt_remerge(request_queue_t *, struct request *); |
| 546 | extern struct request *blk_get_request(request_queue_t *, int, int); | 546 | extern struct request *blk_get_request(request_queue_t *, int, int); |
| 547 | extern void blk_insert_request(request_queue_t *, struct request *, int, void *, int); | 547 | extern void blk_insert_request(request_queue_t *, struct request *, int, void *); |
| 548 | extern void blk_requeue_request(request_queue_t *, struct request *); | 548 | extern void blk_requeue_request(request_queue_t *, struct request *); |
| 549 | extern void blk_plug_device(request_queue_t *); | 549 | extern void blk_plug_device(request_queue_t *); |
| 550 | extern int blk_remove_plug(request_queue_t *); | 550 | extern int blk_remove_plug(request_queue_t *); |