Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932136AbXBWLc0 (ORCPT ); Fri, 23 Feb 2007 06:32:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932145AbXBWLc0 (ORCPT ); Fri, 23 Feb 2007 06:32:26 -0500 Received: from cassiel.sirena.org.uk ([80.68.93.111]:2982 "EHLO cassiel.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932136AbXBWLcZ (ORCPT ); Fri, 23 Feb 2007 06:32:25 -0500 Date: Fri, 23 Feb 2007 11:32:11 +0000 From: Mark Brown To: Andrew Morton , Tim Hockin , Jeff Garzik Cc: Adrian Bunk , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: natsemi: Fix detection of vanilla natsemi cards Message-ID: <20070223113209.GB9282@sirena.org.uk> Mail-Followup-To: Andrew Morton , Tim Hockin , Jeff Garzik , Adrian Bunk , netdev@vger.kernel.org, linux-kernel@vger.kernel.org References: <20070223020920.b9528e0e.akpm@linux-foundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070223020920.b9528e0e.akpm@linux-foundation.org> X-Cookie: One FISHWICH coming up!! User-Agent: Mutt/1.5.9i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1245 Lines: 29 Bob Tracy reported that the addition of support for Aculab E1/T1 cPCI carrier cards broke detection of vanilla natsemi cards. This patch fixes that: the problem is that the driver-specific data in the PCI device table is an index into a second table and this had not been updated for the vanilla cards. This patch fixes the problem minimally. Signed-Off-By: Mark Brown --- linux.orig/drivers/net/natsemi.c 2007-02-23 11:13:03.000000000 +0000 +++ linux/drivers/net/natsemi.c 2007-02-23 11:12:00.000000000 +0000 @@ -260,7 +260,7 @@ static const struct pci_device_id natsemi_pci_tbl[] __devinitdata = { { PCI_VENDOR_ID_NS, 0x0020, 0x12d9, 0x000c, 0, 0, 0 }, - { PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 } + { PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, { } /* terminate list */ }; MODULE_DEVICE_TABLE(pci, natsemi_pci_tbl); -- "You grabbed my hand and we fell into it, like a daydream - or a fever." - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/