Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: drivers/ide/generic.c -> drivers/ide/ide-pci-generic.c
  ide-disk: set non-rotational queue flag for SSD and CF devices
  ide-cd: add TEAC CD-224E to the NO_AUTOCLOSE list
  ide: Add tx4938ide driver (v2)
  TXx9: Add TX4938 ATA support (v3)
  ide: Add tx4939ide driver (v6)
  ide: two more pci_ioremap_bar() conversions
  pci: use pci_ioremap_bar() in drivers/ide
  sgiioc4: use ide_host_add() (take 2)
  sgiioc4: fix error cleanup path (take 2)

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 223750c1b5a6..e5adebe8ac2c 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -600,6 +600,7 @@ static int ide_disk_check(ide_drive_t *drive, const char *s)
 static void ide_disk_setup(ide_drive_t *drive)
 {
         struct ide_disk_obj *idkp = drive->driver_data;
+        struct request_queue *q = drive->queue;
         ide_hwif_t *hwif = drive->hwif;
         u16 *id = drive->id;
         char *m = (char *)&id[ATA_ID_PROD];
@@ -626,11 +627,14 @@ static void ide_disk_setup(ide_drive_t *drive)
                 if (max_s > hwif->rqsize)
                         max_s = hwif->rqsize;
 
-                blk_queue_max_sectors(drive->queue, max_s);
+                blk_queue_max_sectors(q, max_s);
         }
 
         printk(KERN_INFO "%s: max request size: %dKiB\n", drive->name,
-                         drive->queue->max_sectors / 2);
+                q->max_sectors / 2);
+
+        if (ata_id_is_ssd(id) || ata_id_is_cfa(id))
+                queue_flag_set_unlocked(QUEUE_FLAG_NONROT, q);
 
         /* calculate drive capacity, and select LBA if possible */
         ide_disk_get_capacity(drive);