diff options
| author | Greg Kroah-Hartman | 2007-01-26 03:15:03 +0100 |
|---|---|---|
| committer | James Bottomley | 2007-01-30 17:34:29 +0100 |
| commit | 20ce791a0e684dceea2b6804a7c7aaa22e8bfa5c (patch) | |
| tree | 8cdfe628e719faccc848627166aa561f4f44770f /drivers/scsi | |
| parent | [SCSI] libsas: Enable automatic spin-up of SAS disks (diff) | |
| download | kernel-qcow2-linux-20ce791a0e684dceea2b6804a7c7aaa22e8bfa5c.tar.gz kernel-qcow2-linux-20ce791a0e684dceea2b6804a7c7aaa22e8bfa5c.tar.xz kernel-qcow2-linux-20ce791a0e684dceea2b6804a7c7aaa22e8bfa5c.zip | |
[SCSI] ipr: remove duplicate device id
This patch removes a duplicate device id from the IPR driver. Based on
the ipr.h file, I'm not so sure this was intended to be a duplicate, and
if so, the .h file should be modified to use the proper sub-device id
instead.
This was pointed out to me by Kay Sievers <kay.sievers@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/ipr.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 4f5273ea2772..95045e33710d 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -7552,8 +7552,6 @@ static struct pci_device_id ipr_pci_table[] __devinitdata = { PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B, 0, 0, 0 }, { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN, PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575C, 0, 0, 0 }, - { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN, - PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B8, 0, 0, 0 }, { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E, PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B7, 0, 0, 0 }, { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_SNIPE, |