diff options
| author |   Tony Luck <tony.luck@intel.com> | 2005-06-20 09:35:34 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-20 09:35:34 -0700 |
| commit | 8ba08378b479f472b37b83542c31bdad465033cf (patch) | |
| tree | f4421227b3065e786c9041cf0ce0073a249e011b /include/linux/blkdev.h | |
| parent | [IA64] Drop spurious paren in entry.h (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | linux-dev-8ba08378b479f472b37b83542c31bdad465033cf.tar.xz linux-dev-8ba08378b479f472b37b83542c31bdad465033cf.zip | |
Auto merge with /home/aegl/GIT/linus
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); extern void blk_attempt_remerge(request_queue_t *, struct request *); extern void __blk_attempt_remerge(request_queue_t *, struct request *); extern struct request *blk_get_request(request_queue_t *, int, int); -extern void blk_insert_request(request_queue_t *, struct request *, int, void *, int); +extern void blk_insert_request(request_queue_t *, struct request *, int, void *); extern void blk_requeue_request(request_queue_t *, struct request *); extern void blk_plug_device(request_queue_t *); extern int blk_remove_plug(request_queue_t *); |