Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[sfrench/cifs-2.6.git] / drivers / scsi / ipr.c

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 14857679f4e966854559a9122d5dda98312b0fb5..0621238fac4a7972a0fa968675e6f5e40d41c34a 100644 (file)
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -6222,11 +6222,10 @@ static struct ata_port_operations ipr_sata_ops = {
 };
 
 static struct ata_port_info sata_port_info = {
-       .flags  = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_SATA_RESET |
-       ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA,
-       .pio_mask       = 0x10, /* pio4 */
-       .mwdma_mask = 0x07,
-       .udma_mask      = 0x7f, /* udma0-6 */
+       .flags          = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA,
+       .pio_mask       = ATA_PIO4_ONLY,
+       .mwdma_mask     = ATA_MWDMA2,
+       .udma_mask      = ATA_UDMA6,
        .port_ops       = &ipr_sata_ops
 };