Merge branch 'upstream'

1 files changed, 4 insertions, 2 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 1be43be5b1d6..b77f156e5768 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -136,6 +136,10 @@ enum {
         ATA_TMOUT_BOOT_QUICK    = 7 * HZ,       /* hueristic */
         ATA_TMOUT_DATAOUT       = 30 * HZ,
         ATA_TMOUT_DATAOUT_QUICK = 5 * HZ,
+        ATA_TMOUT_CDB           = 30 * HZ,
+        ATA_TMOUT_CDB_QUICK     = 5 * HZ,
+        ATA_TMOUT_INTERNAL      = 30 * HZ,
+        ATA_TMOUT_INTERNAL_QUICK = 5 * HZ,
 
         /* ATA bus states */
         BUS_UNKNOWN             = 0,
@@ -286,8 +290,6 @@ struct ata_queued_cmd {
 
         ata_qc_cb_t             complete_fn;
 
-        struct completion       *waiting;
-
         void                    *private_data;
 };