diff -u --recursive --exclude-from /usr/src/exclude --new-file linux.19pre8/drivers/ide/alim15x3.c linux/drivers/ide/alim15x3.c
--- linux.19pre8/drivers/ide/alim15x3.c	Fri May  3 01:04:51 2002
+++ linux/drivers/ide/alim15x3.c	Wed Apr 24 23:45:38 2002
@@ -248,7 +248,7 @@
 	byte s_clc, a_clc, r_clc;
 	unsigned long flags;
 	int bus_speed = system_bus_clock();
-	int port = hwif->index ? 0x5c : 0x58;
+	int port = hwif->channel ? 0x5c : 0x58;
 	int portFIFO = hwif->channel ? 0x55 : 0x54;
 	byte cd_dma_fifo = 0;
 
@@ -405,7 +405,7 @@
 	if (!drive->init_speed)
 		drive->init_speed = speed;
 
-	rval = (int)(	((id->dma_ultra >> 11) & 3) ? ide_dma_on :
+	rval = (int)(	((id->dma_ultra >> 11) & 7) ? ide_dma_on :
 			((id->dma_ultra >> 8) & 7) ? ide_dma_on :
 			((id->dma_mword >> 8) & 7) ? ide_dma_on :
 			((id->dma_1word >> 8) & 7) ? ide_dma_on :