Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / mvsas / mv_sas.h

diff --git a/drivers/scsi/mvsas/mv_sas.h b/drivers/scsi/mvsas/mv_sas.h
index 44b474513223b657fa40d447be8823f56110062d..c04a4f5b5972b2ae405eddf6a3aab5ab82dafe2b 100644 (file)
--- a/drivers/scsi/mvsas/mv_sas.h
+++ b/drivers/scsi/mvsas/mv_sas.h
@@ -46,7 +46,7 @@
 #include "mv_defs.h"
 
 #define DRV_NAME               "mvsas"
-#define DRV_VERSION            "0.8.2"
+#define DRV_VERSION            "0.8.16"
 #define MVS_ID_NOT_MAPPED      0x7f
 #define WIDE_PORT_MAX_PHY              4
 #define mv_printk(fmt, arg ...)        \
@@ -458,8 +458,6 @@ int mvs_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func,
                        void *funcdata);
 void __devinit mvs_set_sas_addr(struct mvs_info *mvi, int port_id,
                                u32 off_lo, u32 off_hi, u64 sas_addr);
-int mvs_slave_alloc(struct scsi_device *scsi_dev);
-int mvs_slave_configure(struct scsi_device *sdev);
 void mvs_scan_start(struct Scsi_Host *shost);
 int mvs_scan_finished(struct Scsi_Host *shost, unsigned long time);
 int mvs_queue_command(struct sas_task *task, const int num,