summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorBrian King <brking@us.ibm.com>2006-08-03 13:54:59 -0500
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-08-04 09:29:17 -0400
commitfddafd3d21953d5ea740f7b2f27149f7dd493194 (patch)
tree7e1851143eebfc9ba107aab41e6a46c2ec727aad /drivers/block
parent2672ea86be26353108a72a28910df4dc61cdb5e2 (diff)
downloadop-kernel-dev-fddafd3d21953d5ea740f7b2f27149f7dd493194.zip
op-kernel-dev-fddafd3d21953d5ea740f7b2f27149f7dd493194.tar.gz
[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>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/DAC960.c2
1 files changed, 1 insertions, 1 deletions
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_table[] = {
{
.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,
},
OpenPOWER on IntegriCloud