35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From git-commits-head-owner@vger.kernel.org Tue Sep 26 20:10:24 2006
|
|
|
|
commit fddafd3d21953d5ea740f7b2f27149f7dd493194
|
|
tree 7e1851143eebfc9ba107aab41e6a46c2ec727aad
|
|
parent 2672ea86be26353108a72a28910df4dc61cdb5e2
|
|
author Brian King <brking@us.ibm.com> 1154631299 -0500
|
|
committer James Bottomley <jejb@mulgrave.il.steeleye.com> 1154698157 -0400
|
|
|
|
[SCSI] DAC960: PCI id table fixup
|
|
|
|
The PCI ID table in the DAC960 driver conflicts with some devices
|
|
that use the ipr driver. All ipr adapters that use this chip
|
|
have an IBM subvendor ID and all DAC960 adapters that use this
|
|
chip have a Mylex subvendor id.
|
|
|
|
Signed-off-by: Brian King <brking@us.ibm.com>
|
|
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
|
|
|
|
drivers/block/DAC960.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
|
|
index 4cd23c3..a360215 100644
|
|
--- a/drivers/block/DAC960.c
|
|
+++ b/drivers/block/DAC960.c
|
|
@@ -7115,7 +7115,7 @@ static struct pci_device_id DAC960_id_ta
|
|
{
|
|
.vendor = PCI_VENDOR_ID_MYLEX,
|
|
.device = PCI_DEVICE_ID_MYLEX_DAC960_GEM,
|
|
- .subvendor = PCI_ANY_ID,
|
|
+ .subvendor = PCI_VENDOR_ID_MYLEX,
|
|
.subdevice = PCI_ANY_ID,
|
|
.driver_data = (unsigned long) &DAC960_GEM_privdata,
|
|
},
|