diff options
| author | Wayne Boyer <wayneb@linux.vnet.ibm.com> | 2010-06-24 13:34:14 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-07-27 12:03:54 -0500 |
| commit | b0f56d3d6becfb338a41615d6ce43d41547502c3 (patch) | |
| tree | fab3c47dda0564b3d2648a477960bbc87697f9f8 /drivers/scsi/ipr.c | |
| parent | 24ae163ed33d2b8a70d2f0b1947b401d0a8e8719 (diff) | |
| download | kernel_samsung_smdk4412-b0f56d3d6becfb338a41615d6ce43d41547502c3.tar.gz kernel_samsung_smdk4412-b0f56d3d6becfb338a41615d6ce43d41547502c3.tar.bz2 kernel_samsung_smdk4412-b0f56d3d6becfb338a41615d6ce43d41547502c3.zip | |
[SCSI] ipr: add support for new Obsidian-E embedded adapter
This patch allows the driver to recognize a new Obsidian-E based adapter that
uses a new subsystem ID.
This patch also fixes a few tab/space problems.
Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/ipr.c')
| -rw-r--r-- | drivers/scsi/ipr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index db205c9d42d..ce839c8eeea 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -8892,6 +8892,8 @@ static struct pci_device_id ipr_pci_table[] __devinitdata = { { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E, PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B3, 0, 0, 0 }, { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E, + PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57CC, 0, 0, 0 }, + { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E, PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B7, 0, 0, IPR_USE_LONG_TRANSOP_TIMEOUT | IPR_USE_PCI_WARM_RESET }, { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_SNIPE, |