diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 15:26:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 15:26:44 -0400 |
| commit | b2e961eb2e7a54ffaae82f8e0198b26b54ade98e (patch) | |
| tree | 33e5192a4c84e717d8c2f8235f268216b01053f7 /mm | |
| parent | b8c1c5da1520977cb55a358f20fc09567d40cad9 (diff) | |
| parent | 71f65e6bd7651610d2d6aeb3c12aab63667ace30 (diff) | |
Merge branch 'request-queue-t' of git://git.kernel.dk/linux-2.6-block
* 'request-queue-t' of git://git.kernel.dk/linux-2.6-block:
[BLOCK] Add request_queue_t and mark it deprecated
[BLOCK] Get rid of request_queue_t typedef
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/bounce.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/bounce.c b/mm/bounce.c index ad401fc57440..179fe38a2416 100644 --- a/mm/bounce.c +++ b/mm/bounce.c | |||
| @@ -190,7 +190,7 @@ static int bounce_end_io_read_isa(struct bio *bio, unsigned int bytes_done, int | |||
| 190 | return 0; | 190 | return 0; |
| 191 | } | 191 | } |
| 192 | 192 | ||
| 193 | static void __blk_queue_bounce(request_queue_t *q, struct bio **bio_orig, | 193 | static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig, |
| 194 | mempool_t *pool) | 194 | mempool_t *pool) |
| 195 | { | 195 | { |
| 196 | struct page *page; | 196 | struct page *page; |
| @@ -275,7 +275,7 @@ static void __blk_queue_bounce(request_queue_t *q, struct bio **bio_orig, | |||
| 275 | *bio_orig = bio; | 275 | *bio_orig = bio; |
| 276 | } | 276 | } |
| 277 | 277 | ||
| 278 | void blk_queue_bounce(request_queue_t *q, struct bio **bio_orig) | 278 | void blk_queue_bounce(struct request_queue *q, struct bio **bio_orig) |
| 279 | { | 279 | { |
| 280 | mempool_t *pool; | 280 | mempool_t *pool; |
| 281 | 281 | ||