From: Mikael Pettersson This patch fixes ide-scsi.c for the ide_drive_t->queue type change in 2.6.0-test3. Without the patch you'll get these new warnings in -test3: drivers/scsi/ide-scsi.c: In function `idescsi_abort': drivers/scsi/ide-scsi.c:875: warning: passing arg 1 of `elv_queue_empty' from incompatible pointer type drivers/scsi/ide-scsi.c: In function `idescsi_reset': drivers/scsi/ide-scsi.c:902: warning: passing arg 1 of `elv_next_request' from incompatible pointer type drivers/scsi/ide-scsi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/scsi/ide-scsi.c~ide-scsi-queue-conversion-fix drivers/scsi/ide-scsi.c --- 25/drivers/scsi/ide-scsi.c~ide-scsi-queue-conversion-fix 2003-08-09 15:18:48.000000000 -0700 +++ 25-akpm/drivers/scsi/ide-scsi.c 2003-08-09 15:18:48.000000000 -0700 @@ -872,7 +872,7 @@ static int idescsi_abort (Scsi_Cmnd *cmd continue; } /* no, but is it queued in the ide subsystem? */ - if (elv_queue_empty(&drive->queue)) { + if (elv_queue_empty(drive->queue)) { spin_unlock_irqrestore(&ide_lock, flags); return SUCCESS; } @@ -899,7 +899,7 @@ static int idescsi_reset (Scsi_Cmnd *cmd schedule_timeout(1); } /* now nuke the drive queue */ - while ((req = elv_next_request(&drive->queue))) { + while ((req = elv_next_request(drive->queue))) { blkdev_dequeue_request(req); end_that_request_last(req); } _