Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932413AbXBWO1I (ORCPT ); Fri, 23 Feb 2007 09:27:08 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932409AbXBWO1I (ORCPT ); Fri, 23 Feb 2007 09:27:08 -0500 Received: from cassiel.sirena.org.uk ([80.68.93.111]:4828 "EHLO cassiel.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932402AbXBWO1G (ORCPT ); Fri, 23 Feb 2007 09:27:06 -0500 Date: Fri, 23 Feb 2007 14:26:22 +0000 From: Mark Brown To: Bob Tracy Cc: Andrew Morton , Tim Hockin , Jeff Garzik , Adrian Bunk , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: natsemi: Fix detection of vanilla natsemi cards Message-ID: <20070223142621.GD9282@sirena.org.uk> Mail-Followup-To: Bob Tracy , Andrew Morton , Tim Hockin , Jeff Garzik , Adrian Bunk , netdev@vger.kernel.org, linux-kernel@vger.kernel.org References: <20070223113209.GB9282@sirena.org.uk> <20070223134740.E5ECADBA1@gherkin.frus.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070223134740.E5ECADBA1@gherkin.frus.com> 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: 1077 Lines: 27 On Fri, Feb 23, 2007 at 07:47:40AM -0600, Bob Tracy wrote: > ACK except for a missing comma at the end of the line being replaced, > which prevents the patch from applying cleanly. Otherwise, this fixes > the problem I was having. Thanks! Aargh. --- 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/