1 files changed, 8 insertions, 2 deletions

diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 6cbb1982ed03..467274a764d1 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -5,6 +5,7 @@
 #include <linux/list.h>
 #include <linux/types.h>
 #include <linux/workqueue.h>
+#include <linux/mutex.h>
 
 struct block_device;
 struct completion;
@@ -296,6 +297,12 @@ struct scsi_host_template {
         int (*proc_info)(struct Scsi_Host *, char *, char **, off_t, int, int);
 
         /*
+         * suspend support
+         */
+        int (*resume)(struct scsi_device *);
+        int (*suspend)(struct scsi_device *);
+
+        /*
          * Name of proc directory
          */
         char *proc_name;
@@ -392,7 +399,6 @@ struct scsi_host_template {
         /*
          * ordered write support
          */
-        unsigned ordered_flush:1;
         unsigned ordered_tag:1;
 
         /*
@@ -464,7 +470,7 @@ struct Scsi_Host {
         spinlock_t              default_lock;
         spinlock_t              *host_lock;
 
-        struct semaphore        scan_mutex;/* serialize scanning activity */
+        struct mutex            scan_mutex;/* serialize scanning activity */
 
         struct list_head        eh_cmd_q;
         struct task_struct    * ehandler;  /* Error recovery thread. */