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 /drivers/block/z2ram.c | |
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 'drivers/block/z2ram.c')
-rw-r--r-- | drivers/block/z2ram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c index e40fa98842e5..2d5853cbd4b0 100644 --- a/drivers/block/z2ram.c +++ b/drivers/block/z2ram.c | |||
@@ -67,7 +67,7 @@ static DEFINE_SPINLOCK(z2ram_lock); | |||
67 | static struct block_device_operations z2_fops; | 67 | static struct block_device_operations z2_fops; |
68 | static struct gendisk *z2ram_gendisk; | 68 | static struct gendisk *z2ram_gendisk; |
69 | 69 | ||
70 | static void do_z2_request(request_queue_t *q) | 70 | static void do_z2_request(struct request_queue *q) |
71 | { | 71 | { |
72 | struct request *req; | 72 | struct request *req; |
73 | while ((req = elv_next_request(q)) != NULL) { | 73 | while ((req = elv_next_request(q)) != NULL) { |