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

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 12ac0b511f79..e83647651b31 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -768,7 +768,7 @@ static void ata_scsi_dev_config(struct scsi_device *sdev,
          * Decrement max hw segments accordingly.
          */
         if (dev->class == ATA_DEV_ATAPI) {
-                request_queue_t *q = sdev->request_queue;
+                struct request_queue *q = sdev->request_queue;
                 blk_queue_max_hw_segments(q, q->max_hw_segments - 1);
         }