diff options
| -rw-r--r-- | drivers/block/cciss.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 08a2e619dc36..5e215ff0a6bb 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
| @@ -56,16 +56,14 @@ | |||
| 56 | #include <linux/kthread.h> | 56 | #include <linux/kthread.h> |
| 57 | 57 | ||
| 58 | #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin)) | 58 | #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin)) |
| 59 | #define DRIVER_NAME "HP CISS Driver (v 3.6.20)" | 59 | #define DRIVER_NAME "HP CISS Driver (v 3.6.26)" |
| 60 | #define DRIVER_VERSION CCISS_DRIVER_VERSION(3, 6, 20) | 60 | #define DRIVER_VERSION CCISS_DRIVER_VERSION(3, 6, 26) |
| 61 | 61 | ||
| 62 | /* Embedded module documentation macros - see modules.h */ | 62 | /* Embedded module documentation macros - see modules.h */ |
| 63 | MODULE_AUTHOR("Hewlett-Packard Company"); | 63 | MODULE_AUTHOR("Hewlett-Packard Company"); |
| 64 | MODULE_DESCRIPTION("Driver for HP Smart Array Controllers"); | 64 | MODULE_DESCRIPTION("Driver for HP Smart Array Controllers"); |
| 65 | MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400" | 65 | MODULE_SUPPORTED_DEVICE("HP Smart Array Controllers"); |
| 66 | " SA6i P600 P800 P400 P400i E200 E200i E500 P700m" | 66 | MODULE_VERSION("3.6.26"); |
| 67 | " Smart Array G2 Series SAS/SATA Controllers"); | ||
| 68 | MODULE_VERSION("3.6.20"); | ||
| 69 | MODULE_LICENSE("GPL"); | 67 | MODULE_LICENSE("GPL"); |
| 70 | 68 | ||
| 71 | static int cciss_allow_hpsa; | 69 | static int cciss_allow_hpsa; |
| @@ -107,6 +105,11 @@ static const struct pci_device_id cciss_pci_device_id[] = { | |||
| 107 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3249}, | 105 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3249}, |
| 108 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x324A}, | 106 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x324A}, |
| 109 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x324B}, | 107 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x324B}, |
| 108 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3250}, | ||
| 109 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3251}, | ||
| 110 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3252}, | ||
| 111 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3253}, | ||
| 112 | {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3254}, | ||
| 110 | {0,} | 113 | {0,} |
| 111 | }; | 114 | }; |
| 112 | 115 | ||
| @@ -146,6 +149,11 @@ static struct board_type products[] = { | |||
| 146 | {0x3249103C, "Smart Array P812", &SA5_access}, | 149 | {0x3249103C, "Smart Array P812", &SA5_access}, |
| 147 | {0x324A103C, "Smart Array P712m", &SA5_access}, | 150 | {0x324A103C, "Smart Array P712m", &SA5_access}, |
| 148 | {0x324B103C, "Smart Array P711m", &SA5_access}, | 151 | {0x324B103C, "Smart Array P711m", &SA5_access}, |
| 152 | {0x3250103C, "Smart Array", &SA5_access}, | ||
| 153 | {0x3251103C, "Smart Array", &SA5_access}, | ||
| 154 | {0x3252103C, "Smart Array", &SA5_access}, | ||
| 155 | {0x3253103C, "Smart Array", &SA5_access}, | ||
| 156 | {0x3254103C, "Smart Array", &SA5_access}, | ||
| 149 | }; | 157 | }; |
| 150 | 158 | ||
| 151 | /* How long to wait (in milliseconds) for board to go into simple mode */ | 159 | /* How long to wait (in milliseconds) for board to go into simple mode */ |
