Merge branch 'master'

2 files changed, 1 insertions, 2 deletions

diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index e94ca4d36035..290e3b4d2aec 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -275,7 +275,7 @@ extern int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd,
                             int data_direction, void *buffer, unsigned bufflen,
                             struct scsi_sense_hdr *, int timeout, int retries);
 extern int scsi_execute_async(struct scsi_device *sdev,
-                              const unsigned char *cmd, int data_direction,
+                              const unsigned char *cmd, int cmd_len, int data_direction,
                               void *buffer, unsigned bufflen, int use_sg,
                               int timeout, int retries, void *privdata,
                               void (*done)(void *, char *, int, int),
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 467274a764d1..827992949c4b 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -554,7 +554,6 @@ struct Scsi_Host {
         /*
          * ordered write support
          */
-        unsigned ordered_flush:1;
         unsigned ordered_tag:1;
 
         /*