aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBrian King <brking@us.ibm.com>2006-12-18 20:53:26 +0100
committerAdrian Bunk <bunk@stusta.de>2006-12-18 20:53:26 +0100
commite634599b5e6b766634a77b2e05a492c08b32a3a5 (patch)
tree58e3902a318ca088c49f179da797ba6ac7f92b9d /drivers
parentd0354e3ba19cdf9acc2ca89bbb59b1e6292a4f44 (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: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'drivers')
-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 37b8cda3e8b..babd29edeb0 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -7118,7 +7118,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,
},