Merge commit 'v2.6.28-rc1' into sched/urgent

1 files changed, 3 insertions, 1 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 947cf84e555d..507f53ef8038 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -340,6 +340,9 @@ enum {
 
         ATA_EHI_DID_RESET       = ATA_EHI_DID_SOFTRESET | ATA_EHI_DID_HARDRESET,
 
+        /* mask of flags to transfer *to* the slave link */
+        ATA_EHI_TO_SLAVE_MASK   = ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET,
+
         /* max tries if error condition is still set after ->error_handler */
         ATA_EH_MAX_TRIES        = 5,
 
@@ -692,7 +695,6 @@ struct ata_port {
         unsigned int            cbl;    /* cable type; ATA_CBL_xxx */
 
         struct ata_queued_cmd   qcmd[ATA_MAX_QUEUE];
-        unsigned long           qc_allocated;
         unsigned int            qc_active;
         int                     nr_active_links; /* #links with active qcs */