1 files changed, 41 insertions, 5 deletions
diff --git a/drivers/scsi/qla2xxx/qla_devtbl.h b/drivers/scsi/qla2xxx/qla_devtbl.h
index 4de48019454f..5109735dd891 100644
--- a/drivers/scsi/qla2xxx/qla_devtbl.h
+++ b/drivers/scsi/qla2xxx/qla_devtbl.h
@@ -1,4 +1,4 @@
-#define QLA_MODEL_NAMES         0x32
+#define QLA_MODEL_NAMES         0x44
 /*
 * Adapter model names.
@@ -53,7 +53,25 @@ static char *qla2x00_model_name[QLA_MODEL_NAMES] = {
        " ",            /* 0x12e */
        "QLA210",       /* 0x12f */
        "EMC 250",      /* 0x130 */
-        "HP A7538A"     /* 0x131 */
+        "HP A7538A",    /* 0x131 */
+        "QLA210",       /* 0x132 */
+        "QLA2460",      /* 0x133 */
+        "QLA2462",      /* 0x134 */
+        "QMC2462",      /* 0x135 */
+        "QMC2462S",     /* 0x136 */
+        "QLE2460",      /* 0x137 */
+        "QLE2462",      /* 0x138 */
+        "QME2462",      /* 0x139 */
+        "QLA2440",      /* 0x13a */
+        "QLA2442",      /* 0x13b */
+        "QSM2442",      /* 0x13c */
+        "QSM2462",      /* 0x13d */
+        "QLE210",       /* 0x13e */
+        "QLE220",       /* 0x13f */
+        "QLA2460",      /* 0x140 */
+        "QLA2462",      /* 0x141 */
+        "QLE2460",      /* 0x142 */
+        "QLE2462"       /* 0x143 */
 };
 static char *qla2x00_model_desc[QLA_MODEL_NAMES] = {
@@ -78,8 +96,8 @@ static char *qla2x00_model_desc[QLA_MODEL_NAMES] = {
        " ",                                            /* 0x112 */
        " ",                                            /* 0x113 */
        " ",                                            /* 0x114 */
-        "133MHz PCI-X to 2Gb FC Single Channel",        /* 0x115 */
+        "133MHz PCI-X to 2Gb FC, Single Channel",       /* 0x115 */
-        "133MHz PCI-X to 2Gb FC Dual Channel",          /* 0x116 */
+        "133MHz PCI-X to 2Gb FC, Dual Channel",         /* 0x116 */
        "PCI-Express to 2Gb FC, Single Channel",        /* 0x117 */
        "PCI-Express to 2Gb FC, Dual Channel",          /* 0x118 */
        "133MHz PCI-X to 2Gb FC Optical",               /* 0x119 */
@@ -106,5 +124,23 @@ static char *qla2x00_model_desc[QLA_MODEL_NAMES] = {
        " ",                                            /* 0x12e */
        "133MHz PCI-X to 2Gb FC SFF",                   /* 0x12f */
        "133MHz PCI-X to 2Gb FC SFF",                   /* 0x130 */
-        "HP 1p2g QLA2340"                               /* 0x131 */
+        "HP 1p2g QLA2340",                              /* 0x131 */
+        "133MHz PCI-X to 2Gb FC, Single Channel",       /* 0x132 */
+        "PCI-X 2.0 to 4Gb FC, Single Channel",          /* 0x133 */
+        "PCI-X 2.0 to 4Gb FC, Dual Channel",            /* 0x134 */
+        "IBM eServer BC 4Gb FC Expansion Card",         /* 0x135 */
+        "IBM eServer BC 4Gb FC Expansion Card SFF",     /* 0x136 */
+        "PCI-Express to 4Gb FC, Single Channel",        /* 0x137 */
+        "PCI-Express to 4Gb FC, Dual Channel",          /* 0x138 */
+        "Dell PCI-Express to 4Gb FC, Dual Channel",     /* 0x139 */
+        "PCI-X 1.0 to 4Gb FC, Single Channel",          /* 0x13a */
+        "PCI-X 1.0 to 4Gb FC, Dual Channel",            /* 0x13b */
+        "Server I/O Module 4Gb FC, Single Channel",     /* 0x13c */
+        "Server I/O Module 4Gb FC, Single Channel",     /* 0x13d */
+        "PCI-Express to 2Gb FC, Single Channel",        /* 0x13e */
+        "PCI-Express to 4Gb FC, Single Channel",        /* 0x13f */
+        "Sun PCI-X 2.0 to 4Gb FC, Single Channel",      /* 0x140 */
+        "Sun PCI-X 2.0 to 4Gb FC, Dual Channel",        /* 0x141 */
+        "Sun PCI-Express to 2Gb FC, Single Channel",    /* 0x142 */
+        "Sun PCI-Express to 4Gb FC, Single Channel"     /* 0x143 */
 };

diff --git a/drivers/scsi/qla2xxx/qla_devtbl.h b/drivers/scsi/qla2xxx/qla_devtbl.h index 4de48019454f..5109735dd891 100644 --- a/drivers/scsi/qla2xxx/qla_devtbl.h +++ b/drivers/scsi/qla2xxx/qla_devtbl.h
@@ -1,4 +1,4 @@
1	#define QLA_MODEL_NAMES 0x32	1	#define QLA_MODEL_NAMES 0x44
2		2
3	/*	3	/*
4	* Adapter model names.	4	* Adapter model names.
@@ -53,7 +53,25 @@ static char *qla2x00_model_name[QLA_MODEL_NAMES] = {
53	" ", /* 0x12e */	53	" ", /* 0x12e */
54	"QLA210", /* 0x12f */	54	"QLA210", /* 0x12f */
55	"EMC 250", /* 0x130 */	55	"EMC 250", /* 0x130 */
56	"HP A7538A" /* 0x131 */	56	"HP A7538A", /* 0x131 */
		57	"QLA210", /* 0x132 */
		58	"QLA2460", /* 0x133 */
		59	"QLA2462", /* 0x134 */
		60	"QMC2462", /* 0x135 */
		61	"QMC2462S", /* 0x136 */
		62	"QLE2460", /* 0x137 */
		63	"QLE2462", /* 0x138 */
		64	"QME2462", /* 0x139 */
		65	"QLA2440", /* 0x13a */
		66	"QLA2442", /* 0x13b */
		67	"QSM2442", /* 0x13c */
		68	"QSM2462", /* 0x13d */
		69	"QLE210", /* 0x13e */
		70	"QLE220", /* 0x13f */
		71	"QLA2460", /* 0x140 */
		72	"QLA2462", /* 0x141 */
		73	"QLE2460", /* 0x142 */
		74	"QLE2462" /* 0x143 */
57	};	75	};
58		76
59	static char *qla2x00_model_desc[QLA_MODEL_NAMES] = {	77	static char *qla2x00_model_desc[QLA_MODEL_NAMES] = {
@@ -78,8 +96,8 @@ static char *qla2x00_model_desc[QLA_MODEL_NAMES] = {
78	" ", /* 0x112 */	96	" ", /* 0x112 */
79	" ", /* 0x113 */	97	" ", /* 0x113 */
80	" ", /* 0x114 */	98	" ", /* 0x114 */
81	"133MHz PCI-X to 2Gb FC Single Channel", /* 0x115 */	99	"133MHz PCI-X to 2Gb FC, Single Channel", /* 0x115 */
82	"133MHz PCI-X to 2Gb FC Dual Channel", /* 0x116 */	100	"133MHz PCI-X to 2Gb FC, Dual Channel", /* 0x116 */
83	"PCI-Express to 2Gb FC, Single Channel", /* 0x117 */	101	"PCI-Express to 2Gb FC, Single Channel", /* 0x117 */
84	"PCI-Express to 2Gb FC, Dual Channel", /* 0x118 */	102	"PCI-Express to 2Gb FC, Dual Channel", /* 0x118 */
85	"133MHz PCI-X to 2Gb FC Optical", /* 0x119 */	103	"133MHz PCI-X to 2Gb FC Optical", /* 0x119 */
@@ -106,5 +124,23 @@ static char *qla2x00_model_desc[QLA_MODEL_NAMES] = {
106	" ", /* 0x12e */	124	" ", /* 0x12e */
107	"133MHz PCI-X to 2Gb FC SFF", /* 0x12f */	125	"133MHz PCI-X to 2Gb FC SFF", /* 0x12f */
108	"133MHz PCI-X to 2Gb FC SFF", /* 0x130 */	126	"133MHz PCI-X to 2Gb FC SFF", /* 0x130 */
109	"HP 1p2g QLA2340" /* 0x131 */	127	"HP 1p2g QLA2340", /* 0x131 */
		128	"133MHz PCI-X to 2Gb FC, Single Channel", /* 0x132 */
		129	"PCI-X 2.0 to 4Gb FC, Single Channel", /* 0x133 */
		130	"PCI-X 2.0 to 4Gb FC, Dual Channel", /* 0x134 */
		131	"IBM eServer BC 4Gb FC Expansion Card", /* 0x135 */
		132	"IBM eServer BC 4Gb FC Expansion Card SFF", /* 0x136 */
		133	"PCI-Express to 4Gb FC, Single Channel", /* 0x137 */
		134	"PCI-Express to 4Gb FC, Dual Channel", /* 0x138 */
		135	"Dell PCI-Express to 4Gb FC, Dual Channel", /* 0x139 */
		136	"PCI-X 1.0 to 4Gb FC, Single Channel", /* 0x13a */
		137	"PCI-X 1.0 to 4Gb FC, Dual Channel", /* 0x13b */
		138	"Server I/O Module 4Gb FC, Single Channel", /* 0x13c */
		139	"Server I/O Module 4Gb FC, Single Channel", /* 0x13d */
		140	"PCI-Express to 2Gb FC, Single Channel", /* 0x13e */
		141	"PCI-Express to 4Gb FC, Single Channel", /* 0x13f */
		142	"Sun PCI-X 2.0 to 4Gb FC, Single Channel", /* 0x140 */
		143	"Sun PCI-X 2.0 to 4Gb FC, Dual Channel", /* 0x141 */
		144	"Sun PCI-Express to 2Gb FC, Single Channel", /* 0x142 */
		145	"Sun PCI-Express to 4Gb FC, Single Channel" /* 0x143 */
110	};	146	};