[PATCH] cciss update

From: <mikem@beardog.cca.cpqcorp.net>

This patch adds support for 2 new controllers.  The first is a PCI-Express
version of the 6400.  The second is actually a SATA controller using the cciss
interface.

diff --git a/Documentation/cciss.txt b/Documentation/cciss.txt
index fef741327bc63ce18b12b12cab65a65eec8a3e68..7d8f67e5c8377a0309a7126deeaf5c6a1f7e2d5a 100644 (file)
--- a/Documentation/cciss.txt
+++ b/Documentation/cciss.txt
@@ -14,6 +14,8 @@ This driver is known to work with the following cards:
        * SA 6400
        * SA 6400 U320 Expansion Module
        * SA 6i
+       * SA 6422
+       * SA V100
 
 If nodes are not already created in the /dev/cciss directory
 

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 990faf3f569d83426f27f836cc55bce6113cf915..b22099f1f9f844958e6d94c47413b535bbf61a7b 100644 (file)
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -45,12 +45,12 @@
 #include <linux/completion.h>
 
 #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin))
-#define DRIVER_NAME "Compaq CISS Driver (v 2.6.0)"
-#define DRIVER_VERSION CCISS_DRIVER_VERSION(2,6,0)
+#define DRIVER_NAME "Compaq CISS Driver (v 2.6.2)"
+#define DRIVER_VERSION CCISS_DRIVER_VERSION(2,6,2)
 
 /* Embedded module documentation macros - see modules.h */
 MODULE_AUTHOR("Hewlett-Packard Company");
-MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 2.6.0");
+MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 2.6.2");
 MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400"
                        " SA6i");
 MODULE_LICENSE("GPL");
@@ -79,6 +79,10 @@ const struct pci_device_id cciss_pci_device_id[] = {
                0x0E11, 0x409D, 0, 0, 0},
        { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
                0x0E11, 0x4091, 0, 0, 0},
+       { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
+               0x0E11, 0x409E, 0, 0, 0},
+       { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,
+               0x103C, 0x3211, 0, 0, 0},
        {0,}
 };
 MODULE_DEVICE_TABLE(pci, cciss_pci_device_id);
@@ -99,6 +103,8 @@ static struct board_type products[] = {
        { 0x409C0E11, "Smart Array 6400", &SA5_access},
        { 0x409D0E11, "Smart Array 6400 EM", &SA5_access},
        { 0x40910E11, "Smart Array 6i", &SA5_access},
+       { 0x409E0E11, "Smart Array 6422", &SA5_access},
+       { 0x3211103C, "Smart Array V100", &SA5_access},
 };
 
 /* How long to wait (in millesconds) for board to go into simple mode */