Merge tag 'media/v4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[karo-tx-linux.git] / include / scsi / scsi_dh.h

diff --git a/include/scsi/scsi_dh.h b/include/scsi/scsi_dh.h
index 85d731746834d258e002c51db293457fc0a52ece..c7bba2b248498cbd8acb11b4b35bb2f0e5fc4ed7 100644 (file)
--- a/include/scsi/scsi_dh.h
+++ b/include/scsi/scsi_dh.h
@@ -52,6 +52,7 @@ enum {
        SCSI_DH_TIMED_OUT,
        SCSI_DH_RES_TEMP_UNAVAIL,
        SCSI_DH_DEV_OFFLINED,
+       SCSI_DH_NOMEM,
        SCSI_DH_NOSYS,
        SCSI_DH_DRIVER_MAX,
 };
@@ -70,6 +71,7 @@ struct scsi_device_handler {
        int (*activate)(struct scsi_device *, activate_complete, void *);
        int (*prep_fn)(struct scsi_device *, struct request *);
        int (*set_params)(struct scsi_device *, const char *);
+       void (*rescan)(struct scsi_device *);
 };
 
 #ifdef CONFIG_SCSI_DH