From b83afabfeecd286f5e874d006fdf3a689d91d338 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 26 Apr 2008 22:25:21 +0200
Subject: [PATCH] --- yaml --- r: 93650 b: refs/heads/master c:
 6d36b95fe2cc5655e96da42eaf19f1aa341c6856 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/ide/pci/alim15x3.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2c8b93ab758a..80988c70d542 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73369d2a15cfe7dceae89a9e70e3d442e4c21576
+refs/heads/master: 6d36b95fe2cc5655e96da42eaf19f1aa341c6856
diff --git a/trunk/drivers/ide/pci/alim15x3.c b/trunk/drivers/ide/pci/alim15x3.c
index ec9fba8ad342..fcd0222ca477 100644
--- a/trunk/drivers/ide/pci/alim15x3.c
+++ b/trunk/drivers/ide/pci/alim15x3.c
@@ -732,8 +732,6 @@ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif)
 
 static void __devinit init_dma_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase)
 {
-	if (m5229_revision < 0x20)
-		return;
 	if (!hwif->channel)
 		outb(inb(dmabase + 2) & 0x60, dmabase + 2);
 	ide_setup_dma(hwif, dmabase);
@@ -794,6 +792,10 @@ static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_dev
 			d.udma_mask = ATA_UDMA5;
 		else
 			d.udma_mask = ATA_UDMA6;
+	} else {
+		d.host_flags |= IDE_HFLAG_NO_DMA;
+
+		d.mwdma_mask = d.swdma_mask = 0;
 	}
 
 	if (idx == 0)