patch-2.4.7 linux/drivers/ide/ide-pmac.c

• Lines: 20
• Date: Sun Jul 15 16:22:23 2001
• Orig file: v2.4.6/linux/drivers/ide/ide-pmac.c
• Orig date: Thu Feb 15 17:22:08 2001

diff -u --recursive --new-file v2.4.6/linux/drivers/ide/ide-pmac.c linux/drivers/ide/ide-pmac.c
@@ -176,7 +176,8 @@
 	if (pmac_ide[ix].dma_regs && pmac_ide[ix].dma_table) {
 		ide_hwifs[ix].dmaproc = &pmac_ide_dmaproc;
 #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO
-		ide_hwifs[ix].autodma = 1;
+		if (!noautodma)
+			ide_hwifs[ix].autodma = 1;
 #endif
 	}
 }
@@ -676,7 +677,8 @@
 
 	ide_hwifs[ix].dmaproc = &pmac_ide_dmaproc;
 #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO
-	ide_hwifs[ix].autodma = 1;
+	if (!noautodma)
+		ide_hwifs[ix].autodma = 1;
 #endif
 }