Merge branch 'upstream'

Conflicts:

	drivers/scsi/libata-core.c

1 files changed, 10 insertions, 3 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index b3d4c906e2..70ca99bbc6 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -162,7 +162,6 @@ enum {
         ATA_QCFLAG_EH_SCHEDULED = (1 << 5), /* EH scheduled */
 
         /* various lengths of time */
-        ATA_TMOUT_EDD           = 5 * HZ,       /* heuristic */
         ATA_TMOUT_PIO           = 30 * HZ,
         ATA_TMOUT_BOOT          = 30 * HZ,      /* heuristic */
         ATA_TMOUT_BOOT_QUICK    = 7 * HZ,       /* heuristic */
@@ -363,6 +362,11 @@ struct ata_device {
         unsigned int            max_sectors;    /* per-device max sectors */
         unsigned int            cdb_len;
 
+        /* per-dev xfer mask */
+        unsigned int            pio_mask;
+        unsigned int            mwdma_mask;
+        unsigned int            udma_mask;
+
         /* for CHS addressing */
         u16                     cylinders;      /* Number of cylinders */
         u16                     heads;          /* Number of heads */
@@ -400,6 +404,7 @@ struct ata_port {
 
         struct ata_host_stats   stats;
         struct ata_host_set     *host_set;
+        struct device           *dev;
 
         struct work_struct      port_task;
 
@@ -520,9 +525,9 @@ extern void ata_eh_qc_retry(struct ata_queued_cmd *qc);
 extern int ata_scsi_release(struct Scsi_Host *host);
 extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
 extern int ata_scsi_device_resume(struct scsi_device *);
-extern int ata_scsi_device_suspend(struct scsi_device *);
+extern int ata_scsi_device_suspend(struct scsi_device *, pm_message_t state);
 extern int ata_device_resume(struct ata_port *, struct ata_device *);
-extern int ata_device_suspend(struct ata_port *, struct ata_device *);
+extern int ata_device_suspend(struct ata_port *, struct ata_device *, pm_message_t state);
 extern int ata_ratelimit(void);
 extern unsigned int ata_busy_sleep(struct ata_port *ap,
                                    unsigned long timeout_pat,
@@ -573,6 +578,8 @@ extern int ata_std_bios_param(struct scsi_device *sdev,
                               struct block_device *bdev,
                               sector_t capacity, int geom[]);
 extern int ata_scsi_slave_config(struct scsi_device *sdev);
+extern struct ata_device *ata_dev_pair(struct ata_port *ap, 
+                                       struct ata_device *adev);
 
 /*
  * Timing helpers