lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge mulgrave-w:git/linux-2.6

Browse Source 
Conflicts:

	include/linux/blkdev.h

Trivial merge to incorporate tag prototypes.
This commit is contained in:
James Bottomley
2006-09-23 21:03:52 -05:00
parent dfdc58ba35 1ab9dd0902
commit 1aedf2ccc6
628 changed files with 33204 additions and 15641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/blkdev.h
View File

@ -748,6 +748,7 @@ extern void blk_queue_invalidate_tags(request_queue_t *);
extern long blk_congestion_wait(int rw, long timeout);
extern struct blk_queue_tag *blk_init_tags(int);
extern void blk_free_tags(struct blk_queue_tag *);
extern void blk_congestion_end(int rw);
extern void blk_rq_bio_prep(request_queue_t *, struct request *, struct bio *);
extern int blkdev_issue_flush(struct block_device *, sector_t *);