Merge branch 'upstream'

2005-10-18 21:52:42 -04:00
parent c4052da6f0 59a10b172f
commit b194b4250c
366 changed files with 9369 additions and 2666 deletions
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -292,10 +292,8 @@ struct ata_device {
 	u8			xfer_mode;
 	unsigned int		xfer_shift;	/* ATA_SHIFT_xxx */

-	/* cache info about current transfer mode */
-	u8			xfer_protocol;	/* taskfile xfer protocol */
-	u8			read_cmd;	/* opcode to use on read */
-	u8			write_cmd;	/* opcode to use on write */
+	unsigned int		multi_count;	/* sectors count for
+						   READ/WRITE MULTIPLE */

 	/* for CHS addressing */
 	u16			cylinders;	/* Number of cylinders */