From: Brian King Date: Sun, 24 Sep 2006 03:59:49 +0000 (+0000) Subject: [PATCH] SCSI: DAC960: PCI id table fixup X-Git-Tag: v2.6.18.2~46 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01fc2a1ad09f97bfcd5b5941d66ae6e2cec4315e;p=thirdparty%2Fkernel%2Fstable.git [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 Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman Signed-off-by: Chris Wright --- diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index 4cd23c3eab41a..a360215dbce79 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, },