From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946246AbWKAFiN (ORCPT ); Wed, 1 Nov 2006 00:38:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1946369AbWKAFhr (ORCPT ); Wed, 1 Nov 2006 00:37:47 -0500 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:11153 "EHLO sous-sol.org") by vger.kernel.org with ESMTP id S1946246AbWKAFhj (ORCPT ); Wed, 1 Nov 2006 00:37:39 -0500 Message-Id: <20061101053742.368996000@sous-sol.org> References: <20061101053340.305569000@sous-sol.org> User-Agent: quilt/0.45-1 Date: Tue, 31 Oct 2006 21:33:57 -0800 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, Brian King , James Bottomley , Greg Kroah-Hartman Subject: [PATCH 17/61] SCSI: DAC960: PCI id table fixup Content-Disposition: inline; filename=scsi-dac960-pci-id-table-fixup.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org -stable review patch. If anyone has any objections, please let us know. ------------------ From: Brian King [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 --- drivers/block/DAC960.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-2.6.18.1.orig/drivers/block/DAC960.c +++ linux-2.6.18.1/drivers/block/DAC960.c @@ -7115,7 +7115,7 @@ static struct pci_device_id DAC960_id_ta { .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, }, --