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/ide/ide-io.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/ide/ide-io.c')
| -rw-r--r-- | drivers/ide/ide-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 484c50e71446..aa9f5f0b1e67 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
| @@ -1327,7 +1327,7 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq) | |||
| 1327 | /* | 1327 | /* |
| 1328 | * Passes the stuff to ide_do_request | 1328 | * Passes the stuff to ide_do_request |
| 1329 | */ | 1329 | */ |
| 1330 | void do_ide_request(request_queue_t *q) | 1330 | void do_ide_request(struct request_queue *q) |
| 1331 | { | 1331 | { |
| 1332 | ide_drive_t *drive = q->queuedata; | 1332 | ide_drive_t *drive = q->queuedata; |
| 1333 | 1333 | ||
