aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/mpt2sas
diff options
context:
space:
mode:
authorsreekanth.reddy@lsi.com <sreekanth.reddy@lsi.com>2012-07-17 06:26:05 -0400
committerJames Bottomley <JBottomley@Parallels.com>2012-08-24 05:10:25 -0400
commite17eee45102bfd28f357efa119c4ecaf7a17c155 (patch)
treed68ad223b54d3f538d67bdfe7518ecb21f4c8e40 /drivers/scsi/mpt2sas
parent433d71766c293a5c7ce1b411dae3fede9b549797 (diff)
[SCSI] mpt2sas: To include more Intel Branding
Updating the customer branding string for "SSD 910 Series" controller Signed-off-by: Sreekanth Reddy <sreekanth.reddy@lsi.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/mpt2sas')
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_base.c4
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_base.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index 9f2d4e909fc0..0d795af9b623 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -1971,9 +1971,9 @@ _base_display_intel_branding(struct MPT2SAS_ADAPTER *ioc)
1971 printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, 1971 printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
1972 MPT2SAS_INTEL_RMS2LL040_BRANDING); 1972 MPT2SAS_INTEL_RMS2LL040_BRANDING);
1973 break; 1973 break;
1974 case MPT2SAS_INTEL_RAMSDALE_SSDID: 1974 case MPT2SAS_INTEL_SSD910_SSDID:
1975 printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, 1975 printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
1976 MPT2SAS_INTEL_RAMSDALE_BRANDING); 1976 MPT2SAS_INTEL_SSD910_BRANDING);
1977 break; 1977 break;
1978 default: 1978 default:
1979 break; 1979 break;
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h
index 68801e6b13d5..2aeb6f974602 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.h
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
@@ -171,8 +171,8 @@
171 "Intel Integrated RAID Module RMS2LL040" 171 "Intel Integrated RAID Module RMS2LL040"
172#define MPT2SAS_INTEL_RS25GB008_BRANDING \ 172#define MPT2SAS_INTEL_RS25GB008_BRANDING \
173 "Intel(R) RAID Controller RS25GB008" 173 "Intel(R) RAID Controller RS25GB008"
174#define MPT2SAS_INTEL_RAMSDALE_BRANDING \ 174#define MPT2SAS_INTEL_SSD910_BRANDING \
175 "Intel 720 Series SSD" 175 "Intel(R) SSD 910 Series"
176/* 176/*
177 * Intel HBA SSDIDs 177 * Intel HBA SSDIDs
178 */ 178 */
@@ -183,7 +183,7 @@
183#define MPT2SAS_INTEL_RMS2LL080_SSDID 0x350E 183#define MPT2SAS_INTEL_RMS2LL080_SSDID 0x350E
184#define MPT2SAS_INTEL_RMS2LL040_SSDID 0x350F 184#define MPT2SAS_INTEL_RMS2LL040_SSDID 0x350F
185#define MPT2SAS_INTEL_RS25GB008_SSDID 0x3000 185#define MPT2SAS_INTEL_RS25GB008_SSDID 0x3000
186#define MPT2SAS_INTEL_RAMSDALE_SSDID 0x3700 186#define MPT2SAS_INTEL_SSD910_SSDID 0x3700
187 187
188/* 188/*
189 * HP HBA branding 189 * HP HBA branding