Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[safe/jmp/linux-2.6] / drivers / scsi / qla2xxx / qla_devtbl.h

diff --git a/drivers/scsi/qla2xxx/qla_devtbl.h b/drivers/scsi/qla2xxx/qla_devtbl.h
index a8fc0ff..d6ea69d 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_devtbl.h
+++ b/drivers/scsi/qla2xxx/qla_devtbl.h
@@ -1,4 +1,4 @@
-#define QLA_MODEL_NAMES         0x4A
+#define QLA_MODEL_NAMES                0x5C
 
 /*
  * Adapter model names and descriptions.
@@ -72,10 +72,28 @@ static char *qla2x00_model_name[QLA_MODEL_NAMES*2] = {
        "QLA2462",      "Sun PCI-X 2.0 to 4Gb FC, Dual Channel",        /* 0x141 */
        "QLE2460",      "Sun PCI-Express to 2Gb FC, Single Channel",    /* 0x142 */
        "QLE2462",      "Sun PCI-Express to 4Gb FC, Single Channel",    /* 0x143 */
-       "QEM2462"       "Server I/O Module 4Gb FC, Dual Channel",       /* 0x144 */
+       "QEM2462",      "Server I/O Module 4Gb FC, Dual Channel",       /* 0x144 */
        "QLE2440",      "PCI-Express to 4Gb FC, Single Channel",        /* 0x145 */
        "QLE2464",      "PCI-Express to 4Gb FC, Quad Channel",          /* 0x146 */
        "QLA2440",      "PCI-X 2.0 to 4Gb FC, Single Channel",          /* 0x147 */
-       " ",            " ",                                            /* 0x148 */
+       "HP AE369A",    "PCI-X 2.0 to 4Gb FC, Dual Channel",            /* 0x148 */
        "QLA2340",      "Sun 133MHz PCI-X to 2Gb FC, Single Channel",   /* 0x149 */
+       " ",            " ",                                            /* 0x14a */
+       " ",            " ",                                            /* 0x14b */
+       "QMC2432M",     "IBM eServer BC 4Gb FC Expansion Card CFFE",    /* 0x14c */
+       "QMC2422M",     "IBM eServer BC 4Gb FC Expansion Card CFFX",    /* 0x14d */
+       "QLE220",       "Sun PCI-Express to 4Gb FC, Single Channel",    /* 0x14e */
+       " ",            " ",                                            /* 0x14f */
+       " ",            " ",                                            /* 0x150 */
+       " ",            " ",                                            /* 0x151 */
+       "QME2462",      "PCI-Express to 4Gb FC, Dual Channel Mezz HBA", /* 0x152 */
+       "QMH2462",      "PCI-Express to 4Gb FC, Dual Channel Mezz HBA", /* 0x153 */
+       " ",            " ",                                            /* 0x154 */
+       "QLE220",       "PCI-Express to 4Gb FC, Single Channel",        /* 0x155 */
+       "QLE220",       "PCI-Express to 4Gb FC, Single Channel",        /* 0x156 */
+       " ",            " ",                                            /* 0x157 */
+       " ",            " ",                                            /* 0x158 */
+       " ",            " ",                                            /* 0x159 */
+       " ",            " ",                                            /* 0x15a */
+       "QME2472",      "Dell BS PCI-Express to 4Gb FC, Dual Channel",  /* 0x15b */
 };