1 diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
2 index fecf524..dc447bd 100644
3 --- a/drivers/block/cciss.c
4 +++ b/drivers/block/cciss.c
7 /* Embedded module documentation macros - see modules.h */
8 MODULE_AUTHOR("Hewlett-Packard Company");
9 -MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 3.6.14");
10 +MODULE_DESCRIPTION("Driver for HP Smart Array Controllers");
11 MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400"
12 - " SA6i P600 P800 P400 P400i E200 E200i E500");
13 + " SA6i P600 P800 P400 P400i E200 E200i E500"
14 + " Smart Array G2 Series SAS/SATA Controllers");
15 MODULE_VERSION("3.6.14");
16 MODULE_LICENSE("GPL");
18 @@ -87,6 +88,11 @@ static const struct pci_device_id cciss_pci_device_id[] = {
19 {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3214},
20 {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3215},
21 {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3237},
22 + {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3241},
23 + {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3243},
24 + {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3245},
25 + {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3247},
26 + {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3249},
27 {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
28 PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
30 @@ -119,6 +125,11 @@ static struct board_type products[] = {
31 {0x3214103C, "Smart Array E200i", &SA5_access, 120},
32 {0x3215103C, "Smart Array E200i", &SA5_access, 120},
33 {0x3237103C, "Smart Array E500", &SA5_access, 512},
34 + {0x3241103C, "Smart Array P212", &SA5_access, 384},
35 + {0x3243103C, "Smart Array P410", &SA5_access, 384},
36 + {0x3245103C, "Smart Array P410i", &SA5_access, 384},
37 + {0x3247103C, "Smart Array P411", &SA5_access, 384},
38 + {0x3249103C, "Smart Array P812", &SA5_access, 384},
39 {0xFFFF103C, "Unknown Smart Array", &SA5_access, 120},
42 diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
43 index 5505b33..ea81d4a 100644
44 --- a/include/linux/pci_ids.h
45 +++ b/include/linux/pci_ids.h
47 #define PCI_DEVICE_ID_HP_CISSA 0x3220
48 #define PCI_DEVICE_ID_HP_CISSC 0x3230
49 #define PCI_DEVICE_ID_HP_CISSD 0x3238
50 +#define PCI_DEVICE_ID_HP_CISSE 0x323a
51 #define PCI_DEVICE_ID_HP_ZX2_IOC 0x4031
53 #define PCI_VENDOR_ID_PCTECH 0x1042