This commit was generated by cvs2svn to compensate for changes in r1129,

[linux-2.6.git] / drivers / scsi / qla2xxx / ql6312.c

diff --git a/drivers/scsi/qla2xxx/ql6312.c b/drivers/scsi/qla2xxx/ql6312.c
index 9649d92..de55397 100644 (file)
--- a/drivers/scsi/qla2xxx/ql6312.c
+++ b/drivers/scsi/qla2xxx/ql6312.c
@@ -1,15 +1,13 @@
 /*
- * QLogic ISP6312 device driver for Linux 2.6.x
- * Copyright (C) 2003-2004 QLogic Corporation (www.qlogic.com)
+ * QLogic Fibre Channel HBA Driver
+ * Copyright (c)  2003-2005 QLogic Corporation
  *
- * Released under GPL v2.
+ * See LICENSE.qla2xxx for copyright and licensing details.
  */
-
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 
-#include "qla_os.h"
 #include "qla_def.h"
 
 static char qla_driver_name[] = "qla6312";
@@ -36,6 +34,11 @@ static struct qla_board_info qla_board_tbl[] = {
                .isp_name       = "ISP6312",
                .fw_info        = qla_fw_tbl,
        },
+       {
+               .drv_name       = qla_driver_name,
+               .isp_name       = "ISP6322",
+               .fw_info        = qla_fw_tbl,
+       },
 };
 
 static struct pci_device_id qla6312_pci_tbl[] = {
@@ -46,6 +49,13 @@ static struct pci_device_id qla6312_pci_tbl[] = {
                .subdevice      = PCI_ANY_ID,
                .driver_data    = (unsigned long)&qla_board_tbl[0],
        },
+       {
+               .vendor         = PCI_VENDOR_ID_QLOGIC,
+               .device         = PCI_DEVICE_ID_QLOGIC_ISP6322,
+               .subvendor      = PCI_ANY_ID,
+               .subdevice      = PCI_ANY_ID,
+               .driver_data    = (unsigned long)&qla_board_tbl[1],
+       },
        {0, 0},
 };
 MODULE_DEVICE_TABLE(pci, qla6312_pci_tbl);
@@ -86,5 +96,6 @@ module_init(qla6312_init);
 module_exit(qla6312_exit);
 
 MODULE_AUTHOR("QLogic Corporation");
-MODULE_DESCRIPTION("QLogic ISP6312 FC-SCSI Host Bus Adapter driver");
+MODULE_DESCRIPTION("QLogic ISP63xx FC-SCSI Host Bus Adapter driver");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(QLA2XXX_VERSION);