Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[deliverable/linux.git] / include / scsi / scsi_driver.h

diff --git a/include/scsi/scsi_driver.h b/include/scsi/scsi_driver.h
index d443aa06a72287e4a1ca45c70243b38628686a30..20fdfc2526adb1a2bd63bae4564b5faf2428256a 100644 (file)
--- a/include/scsi/scsi_driver.h
+++ b/include/scsi/scsi_driver.h
@@ -16,7 +16,7 @@ struct scsi_driver {
 
        void (*rescan)(struct device *);
        int (*done)(struct scsi_cmnd *);
-       int (*eh_action)(struct scsi_cmnd *, unsigned char *, int, int);
+       int (*eh_action)(struct scsi_cmnd *, int);
 };
 #define to_scsi_driver(drv) \
        container_of((drv), struct scsi_driver, gendrv)