Merge branch 'upstream'

[linux-2.6-omap-h63xx.git] / include / linux / libata.h

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 0f89f4121fa36df2782f7ed0a3ecbfe8d2e9208b..d3f58a796c3a371f1497af11c581e541e7862908 100644 (file)
--- 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 */