Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[platform/kernel/linux-rpi.git] / include / scsi / scsi_host.h

diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 339f975..aa7b749 100644 (file)
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -607,6 +607,7 @@ struct Scsi_Host {
        short unsigned int sg_tablesize;
        short unsigned int sg_prot_tablesize;
        unsigned int max_sectors;
+       unsigned int opt_sectors;
        unsigned int max_segment_size;
        unsigned long dma_boundary;
        unsigned long virt_boundary_mask;
@@ -789,7 +790,7 @@ extern int scsi_host_block(struct Scsi_Host *shost);
 extern int scsi_host_unblock(struct Scsi_Host *shost, int new_state);
 
 void scsi_host_busy_iter(struct Scsi_Host *,
-                        bool (*fn)(struct scsi_cmnd *, void *, bool), void *priv);
+                        bool (*fn)(struct scsi_cmnd *, void *), void *priv);
 
 struct class_container;