From: Andrew Morton Cc: Jens Axboe Signed-off-by: Andrew Morton --- drivers/mmc/mmc_queue.c | 8 ++++---- scsi/sd.h | 0 2 files changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/mmc/mmc_queue.c~more-request_queue_t-removal drivers/mmc/mmc_queue.c --- a/drivers/mmc/mmc_queue.c~more-request_queue_t-removal +++ a/drivers/mmc/mmc_queue.c @@ -102,7 +102,7 @@ static int mmc_queue_thread(void *d) * on any queue on this host, and attempt to issue it. This may * not be the queue we were asked to process. */ -static void mmc_request(request_queue_t *q) +static void mmc_request(struct request_queue *q) { struct mmc_queue *mq = q->queuedata; struct request *req; @@ -183,7 +183,7 @@ EXPORT_SYMBOL(mmc_init_queue); void mmc_cleanup_queue(struct mmc_queue *mq) { - request_queue_t *q = mq->queue; + struct request_queue *q = mq->queue; unsigned long flags; /* Mark that we should start throwing out stragglers */ @@ -213,7 +213,7 @@ EXPORT_SYMBOL(mmc_cleanup_queue); */ void mmc_queue_suspend(struct mmc_queue *mq) { - request_queue_t *q = mq->queue; + struct request_queue *q = mq->queue; unsigned long flags; if (!(mq->flags & MMC_QUEUE_SUSPENDED)) { @@ -234,7 +234,7 @@ EXPORT_SYMBOL(mmc_queue_suspend); */ void mmc_queue_resume(struct mmc_queue *mq) { - request_queue_t *q = mq->queue; + struct request_queue *q = mq->queue; unsigned long flags; if (mq->flags & MMC_QUEUE_SUSPENDED) { diff -puN drivers/scsi/sd.c~more-request_queue_t-removal drivers/scsi/sd.c diff -puN include/linux/blkdev.h~more-request_queue_t-removal include/linux/blkdev.h diff -puN include/scsi/sd.h~more-request_queue_t-removal include/scsi/sd.h _