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/md/faulty.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/md/faulty.c')
-rw-r--r-- | drivers/md/faulty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/faulty.c b/drivers/md/faulty.c index 4ebd0f2a75ec..cb059cf14c2e 100644 --- a/drivers/md/faulty.c +++ b/drivers/md/faulty.c | |||
@@ -167,7 +167,7 @@ static void add_sector(conf_t *conf, sector_t start, int mode) | |||
167 | conf->nfaults = n+1; | 167 | conf->nfaults = n+1; |
168 | } | 168 | } |
169 | 169 | ||
170 | static int make_request(request_queue_t *q, struct bio *bio) | 170 | static int make_request(struct request_queue *q, struct bio *bio) |
171 | { | 171 | { |
172 | mddev_t *mddev = q->queuedata; | 172 | mddev_t *mddev = q->queuedata; |
173 | conf_t *conf = (conf_t*)mddev->private; | 173 | conf_t *conf = (conf_t*)mddev->private; |