summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian King <brking@us.ibm.com>2006-09-24 03:59:49 +0000
committerChris Wright <chrisw@sous-sol.org>2006-11-03 17:33:45 -0800
commit01fc2a1ad09f97bfcd5b5941d66ae6e2cec4315e (patch)
tree3871b4670a7ad4e7a3ba52b8374df3246cfab434
parent9ee03a230d10a22e36f1e1fdcc2e0a92628e9ac6 (diff)
downloadlwn-01fc2a1ad09f97bfcd5b5941d66ae6e2cec4315e.tar.gz
lwn-01fc2a1ad09f97bfcd5b5941d66ae6e2cec4315e.zip
[PATCH] SCSI: DAC960: PCI id table fixup
[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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Chris Wright <chrisw@sous-sol.org>
-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 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[] = {
{
.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,
},