Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

[cascardo/linux.git] / drivers / scsi / bfa / bfad_drv.h

diff --git a/drivers/scsi/bfa/bfad_drv.h b/drivers/scsi/bfa/bfad_drv.h
index 78d3401..8b97877 100644 (file)
--- a/drivers/scsi/bfa/bfad_drv.h
+++ b/drivers/scsi/bfa/bfad_drv.h
@@ -57,7 +57,7 @@
 #ifdef BFA_DRIVER_VERSION
 #define BFAD_DRIVER_VERSION    BFA_DRIVER_VERSION
 #else
-#define BFAD_DRIVER_VERSION    "3.2.21.1"
+#define BFAD_DRIVER_VERSION    "3.2.23.0"
 #endif
 
 #define BFAD_PROTO_NAME FCPI_NAME
@@ -240,8 +240,8 @@ enum bfad_sm_event {
        BFAD_E_KTHREAD_CREATE_FAILED    = 2,
        BFAD_E_INIT                     = 3,
        BFAD_E_INIT_SUCCESS             = 4,
-       BFAD_E_INIT_FAILED              = 5,
-       BFAD_E_INTR_INIT_FAILED         = 6,
+       BFAD_E_HAL_INIT_FAILED          = 5,
+       BFAD_E_INIT_FAILED              = 6,
        BFAD_E_FCS_EXIT_COMP            = 7,
        BFAD_E_EXIT_COMP                = 8,
        BFAD_E_STOP                     = 9