Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0

[firefly-linux-kernel-4.4.55.git] / drivers / ata / pdc_adma.c

diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index adbe0426c8f08a13a3ec53ff7fb51f58d65b9597..1111712b3d7d8319abf4c8209d5f5c767e748ab5 100644 (file)
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -166,9 +166,7 @@ static struct ata_port_operations adma_ata_ops = {
 static struct ata_port_info adma_port_info[] = {
        /* board_1841_idx */
        {
-               .flags          = ATA_FLAG_SLAVE_POSS |
-                                 ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO |
-                                 ATA_FLAG_PIO_POLLING,
+               .flags          = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_POLLING,
                .pio_mask       = ATA_PIO4_ONLY,
                .udma_mask      = ATA_UDMA4,
                .port_ops       = &adma_ata_ops,