drivers/scsi/qla2xxx/qla_version.h

   1 /*
   2  * QLogic Fibre Channel HBA Driver
   3  * Copyright (c)  2003-2005 QLogic Corporation
   4  *
   5  * See LICENSE.qla2xxx for copyright and licensing details.
   6  */
   7 /*
   8  * Driver version
   9  */
  10 <<<<<<< HEAD:drivers/scsi/qla2xxx/qla_version.h
  11 #define QLA2XXX_VERSION      "8.02.00-k8"
  12 =======
  13 #define QLA2XXX_VERSION      "8.02.00-k9"
  14 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:drivers/scsi/qla2xxx/qla_version.h
  15
  16 #define QLA_DRIVER_MAJOR_VER    8
  17 #define QLA_DRIVER_MINOR_VER    2
  18 #define QLA_DRIVER_PATCH_VER    0
  19 #define QLA_DRIVER_BETA_VER     0