Merge branch 'upstream'

[linux-2.6-microblaze.git] / include / linux / libata.h

diff --git a/include/linux/libata.h b/include/linux/libata.h
index a89969a..f24e4bb 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -286,10 +286,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 */