xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge SCSI misc branch into isci-for-3.6 tag

Browse Source
This commit is contained in:
James Bottomley
2012-10-02 08:55:12 +01:00
parent 1c4cf1d584 0644f5393e
commit fe709ed827
176 changed files with 13507 additions and 4475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/mpt2sas/mpt2sas_base.c
View File

@@ -3,7 +3,7 @@
* for access to MPT (Message Passing Technology) firmware.
*
* This code is based on drivers/scsi/mpt2sas/mpt2_base.c
* Copyright (C) 2007-2010 LSI Corporation
* Copyright (C) 2007-2012 LSI Corporation
* (mailto:DL-MPTFusionLinux@lsi.com)
*
* This program is free software; you can redistribute it and/or
@@ -1971,9 +1971,9 @@ _base_display_intel_branding(struct MPT2SAS_ADAPTER *ioc)
printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
MPT2SAS_INTEL_RMS2LL040_BRANDING);
break;
case MPT2SAS_INTEL_RAMSDALE_SSDID:
case MPT2SAS_INTEL_SSD910_SSDID:
printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
MPT2SAS_INTEL_RAMSDALE_BRANDING);
MPT2SAS_INTEL_SSD910_BRANDING);
break;
default:
break;