Merge branch 'linus-plus-plus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'linus-plus-plus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: limit post SRST nsect/lbal wait to ~100ms
  libata: force PIO on IOMEGA ZIP 250 ATAPI
  libata passthru: update cached device paramters
  libata passthru: always enforce correct DEV bit
  libata passthru: map UDMA protocols
  libata passthru: support PIO multi commands
  libata passthru: update protocol numbers
  libata: Correct abuse of language
  libata-core/sff: Fix multiple assumptions about DMA
  ahci: Add MCP73/MCP77 support to AHCI driver
  libata: fix hw_sata_spd_limit initialization
  libata: print device model and firmware revision for ATAPI devices
  libata: fix probe time irq printouts
  libata: disable NCQ for HITACHI HTS541680J9SA00/SB21C7EP
  remove unused variable in pata_isapnp

2 files changed, 3 insertions, 1 deletions

diff --git a/include/linux/ata.h b/include/linux/ata.h
index edb31bfff68f..703febb2df31 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -151,6 +151,7 @@ enum {
         ATA_CMD_WRITE_MULTI_EXT = 0x39,
         ATA_CMD_WRITE_MULTI_FUA_EXT = 0xCE,
         ATA_CMD_SET_FEATURES    = 0xEF,
+        ATA_CMD_SET_MULTI       = 0xC6,
         ATA_CMD_PACKET          = 0xA0,
         ATA_CMD_VERIFY          = 0x40,
         ATA_CMD_VERIFY_EXT      = 0x42,
@@ -249,7 +250,7 @@ enum ata_tf_protocols {
         /* ATA taskfile protocols */
         ATA_PROT_UNKNOWN,       /* unknown/invalid */
         ATA_PROT_NODATA,        /* no data */
-        ATA_PROT_PIO,           /* PIO single sector */
+        ATA_PROT_PIO,           /* PIO data xfer */
         ATA_PROT_DMA,           /* DMA */
         ATA_PROT_NCQ,           /* NCQ */
         ATA_PROT_ATAPI,         /* packet command, PIO data xfer*/
diff --git a/include/linux/libata.h b/include/linux/libata.h
index a6a3113120a4..745c4f9b4caa 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -753,6 +753,7 @@ extern u8 ata_check_status(struct ata_port *ap);
 extern u8 ata_altstatus(struct ata_port *ap);
 extern void ata_exec_command(struct ata_port *ap, const struct ata_taskfile *tf);
 extern int ata_port_start (struct ata_port *ap);
+extern int ata_sff_port_start (struct ata_port *ap);
 extern irqreturn_t ata_interrupt (int irq, void *dev_instance);
 extern void ata_data_xfer(struct ata_device *adev, unsigned char *buf,
                           unsigned int buflen, int write_data);