patch-2.1.6 linux/drivers/block/ide.c

• Lines: 33
• Date: Tue Oct 29 00:31:24 1996
• Orig file: v2.1.5/linux/drivers/block/ide.c
• Orig date: Wed Oct 16 10:48:08 1996

diff -u --recursive --new-file v2.1.5/linux/drivers/block/ide.c linux/drivers/block/ide.c
@@ -288,7 +288,7 @@
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
-#include <asm/segment.h>
+#include <asm/uaccess.h>
 #include <asm/io.h>
 
 #ifdef CONFIG_PCI
@@ -2272,11 +2272,13 @@
 	unsigned long capacity, check;
 
 	id = drive->id = kmalloc (SECTOR_WORDS*4, GFP_KERNEL);
-	ide_input_data(drive, id, SECTOR_WORDS);	/* read 512 bytes of id info */
+	ide_input_data(drive, id, SECTOR_WORDS);/* read 512 bytes of id info */
 	sti();
 
+#if defined (CONFIG_SCSI_EATA_DMA) || defined (CONFIG_SCSI_EATA_PIO)
 	/*
-	 * EATA SCSI controllers do a hardware ATA emulation:  ignore them
+	 * EATA SCSI controllers do a hardware ATA emulation:  
+	 * Ignore them if there is a driver for them available.
 	 */
 	if ((id->model[0] == 'P' && id->model[1] == 'M')
 	 || (id->model[0] == 'S' && id->model[1] == 'K')) {
@@ -2284,6 +2286,7 @@
 		drive->present = 0;
 		return;
 	}
+#endif
 
 	/*
 	 *  WIN_IDENTIFY returns little-endian info,