summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-24 12:26:44 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-24 12:26:44 -0700
commitb2e961eb2e7a54ffaae82f8e0198b26b54ade98e (patch)
tree33e5192a4c84e717d8c2f8235f268216b01053f7 /mm
parentb8c1c5da1520977cb55a358f20fc09567d40cad9 (diff)
parent71f65e6bd7651610d2d6aeb3c12aab63667ace30 (diff)
downloadop-kernel-dev-b2e961eb2e7a54ffaae82f8e0198b26b54ade98e.zip
op-kernel-dev-b2e961eb2e7a54ffaae82f8e0198b26b54ade98e.tar.gz
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/bounce.c b/mm/bounce.c
index ad401fc..179fe38 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
return 0;
}
-static void __blk_queue_bounce(request_queue_t *q, struct bio **bio_orig,
+static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig,
mempool_t *pool)
{
struct page *page;
@@ -275,7 +275,7 @@ static void __blk_queue_bounce(request_queue_t *q, struct bio **bio_orig,
*bio_orig = bio;
}
-void blk_queue_bounce(request_queue_t *q, struct bio **bio_orig)
+void blk_queue_bounce(struct request_queue *q, struct bio **bio_orig)
{
mempool_t *pool;
OpenPOWER on IntegriCloud