patch-2.0.35 linux/drivers/block/ide.h

Next file: linux/drivers/block/linear.c
Previous file: linux/drivers/block/ide.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.0.34/linux/drivers/block/ide.h linux/drivers/block/ide.h
@@ -381,6 +381,7 @@
 #ifdef CONFIG_BLK_DEV_IDESCSI
 	void *scsi;			/* for ide-scsi.c */
 #endif /* CONFIG_BLK_DEV_IDESCSI */
+	byte		ide_scsi;	/* use ide-scsi driver */
 	} ide_drive_t;
 
 /*
@@ -428,7 +429,7 @@
 typedef enum {	ide_unknown,	ide_generic,	ide_triton,
 		ide_cmd640,	ide_dtc2278,	ide_ali14xx,
 		ide_qd6580,	ide_umc8672,	ide_ht6560b,
-		ide_promise }
+		ide_promise,	ide_promise_udma }
 	hwif_chipset_t;
 
 typedef struct hwif_s {
@@ -742,4 +743,5 @@
 
 #ifdef CONFIG_BLK_DEV_TRITON
 void ide_init_triton (byte, byte);
+void ide_init_promise (byte bus, byte fn, ide_hwif_t *hwif0, ide_hwif_t *hwif1, unsigned short dma);
 #endif /* CONFIG_BLK_DEV_TRITON */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov