Greg KH wrote:
> From: Greg Kroah-Hartman <gregkh@xxxxxxx>
>
> 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.
ACK.
I double checked the subsystem ids and this patch is indeed the correct
fix. It turns out both of these adapters have the same subsystem ids,
which I didn't realize initially.
Thanks,
Brian
>
> This was pointed out to me by Kay Sievers <kay.sievers@xxxxxxx>
>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
>
> ---
> drivers/scsi/ipr.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> --- gregkh-2.6.orig/drivers/scsi/ipr.c
> +++ gregkh-2.6/drivers/scsi/ipr.c
> @@ -7558,9 +7558,6 @@ static struct pci_device_id ipr_pci_tabl
> { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
> PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575C,
> 0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
> - { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,
> - PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B8,
> - 0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
> { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,
> PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B7,
> 0, 0, (kernel_ulong_t)&ipr_chip_cfg[0] },
--
Brian King
eServer Storage I/O
IBM Linux Technology Center
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
