diff options
author | Wendy Xiong <wenxiong@linux.vnet.ibm.com> | 2014-03-12 17:08:52 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2014-03-19 18:04:42 -0400 |
commit | 5eeac3e99ae220aea787527d1bfd9e846adf9fac (patch) | |
tree | 257e93c0053338943d4ff4c9327d21094e271a38 /drivers | |
parent | 169b9ec83f0f1cf1e0c7876b41d04d66c28f16a0 (diff) |
[SCSI] ipr: Add new CCIN definition for Grand Canyon support
Add the appropriate definition and table entry for new hardware support.
Signed-off-by: Wen Xiong <wenxiong@linux.vnet.ibm.com>
Acked-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/ipr.c | 6 | ||||
-rw-r--r-- | drivers/scsi/ipr.h | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 1c6a18a39e85..2f8dd8e4225b 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
@@ -10123,6 +10123,12 @@ static struct pci_device_id ipr_pci_table[] = { | |||
10123 | PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57EF, 0, 0, 0 }, | 10123 | PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57EF, 0, 0, 0 }, |
10124 | { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROCODILE, | 10124 | { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROCODILE, |
10125 | PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57F0, 0, 0, 0 }, | 10125 | PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57F0, 0, 0, 0 }, |
10126 | { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROCODILE, | ||
10127 | PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_2CCA, 0, 0, 0 }, | ||
10128 | { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROCODILE, | ||
10129 | PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_2CD2, 0, 0, 0 }, | ||
10130 | { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROCODILE, | ||
10131 | PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_2CCD, 0, 0, 0 }, | ||
10126 | { } | 10132 | { } |
10127 | }; | 10133 | }; |
10128 | MODULE_DEVICE_TABLE(pci, ipr_pci_table); | 10134 | MODULE_DEVICE_TABLE(pci, ipr_pci_table); |
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h index c343afef4e19..31ed126f7143 100644 --- a/drivers/scsi/ipr.h +++ b/drivers/scsi/ipr.h | |||
@@ -108,6 +108,9 @@ | |||
108 | #define IPR_SUBS_DEV_ID_57EE 0x049A | 108 | #define IPR_SUBS_DEV_ID_57EE 0x049A |
109 | #define IPR_SUBS_DEV_ID_57EF 0x049B | 109 | #define IPR_SUBS_DEV_ID_57EF 0x049B |
110 | #define IPR_SUBS_DEV_ID_57F0 0x049C | 110 | #define IPR_SUBS_DEV_ID_57F0 0x049C |
111 | #define IPR_SUBS_DEV_ID_2CCA 0x04C7 | ||
112 | #define IPR_SUBS_DEV_ID_2CD2 0x04C8 | ||
113 | #define IPR_SUBS_DEV_ID_2CCD 0x04C9 | ||
111 | #define IPR_NAME "ipr" | 114 | #define IPR_NAME "ipr" |
112 | 115 | ||
113 | /* | 116 | /* |