diff options
author | Brian King <brking@us.ibm.com> | 2006-08-03 14:54:59 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-04 09:29:17 -0400 |
commit | fddafd3d21953d5ea740f7b2f27149f7dd493194 (patch) | |
tree | 7e1851143eebfc9ba107aab41e6a46c2ec727aad /drivers/block/DAC960.c | |
parent | 2672ea86be26353108a72a28910df4dc61cdb5e2 (diff) |
[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/DAC960.c')
-rw-r--r-- | drivers/block/DAC960.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index 4cd23c3eab41..a360215dbce7 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c | |||
@@ -7115,7 +7115,7 @@ static struct pci_device_id DAC960_id_table[] = { | |||
7115 | { | 7115 | { |
7116 | .vendor = PCI_VENDOR_ID_MYLEX, | 7116 | .vendor = PCI_VENDOR_ID_MYLEX, |
7117 | .device = PCI_DEVICE_ID_MYLEX_DAC960_GEM, | 7117 | .device = PCI_DEVICE_ID_MYLEX_DAC960_GEM, |
7118 | .subvendor = PCI_ANY_ID, | 7118 | .subvendor = PCI_VENDOR_ID_MYLEX, |
7119 | .subdevice = PCI_ANY_ID, | 7119 | .subdevice = PCI_ANY_ID, |
7120 | .driver_data = (unsigned long) &DAC960_GEM_privdata, | 7120 | .driver_data = (unsigned long) &DAC960_GEM_privdata, |
7121 | }, | 7121 | }, |