Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Sat, 14 Dec 2002 19:58:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Sat, 14 Dec 2002 19:58:07 -0500 Received: from 205-158-62-132.outblaze.com ([205.158.62.132]:44231 "HELO ws5-2.us4.outblaze.com") by vger.kernel.org with SMTP id ; Sat, 14 Dec 2002 19:58:06 -0500 Message-ID: <20021215010552.24545.qmail@operamail.com> Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: inline Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-Mailer: MIME-tools 5.41 (Entity 5.404) From: "Matthew Bell" To: kai-germaschewski@uiowa.edu, mwsb@operamail.com Cc: linux-parport@torque.net, linux-kernel@vger.kernel.org Date: Sun, 15 Dec 2002 09:05:52 +0800 Subject: Re: [PATCH] Obvious(ish): 3c515 should work if ISAPNP is a module. X-Originating-Ip: 195.10.122.134 X-Originating-Server: ws5-2.us4.outblaze.com Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1835 Lines: 53 Oh bum. I had it that way originally, for that reason, then left for a while, wondered what I was doing and removed the 'superflous' bit. +#if defined(CONFIG_ISAPNP) || (defined (MODULE) && defined (CONFIG_ISAPNP_MODULE)) Matthew Bell ----- Original Message ----- From: Kai Germaschewski Date: Sat, 14 Dec 2002 17:11:49 -0600 (CST) To: Matthew Bell Subject: Re: [PATCH] Obvious(ish): 3c515 should work if ISAPNP is a module. > On Sun, 15 Dec 2002, Matthew Bell wrote: > > > This is valid for at least 2.4.20 and earlier; it works for me, and I > > can't see any exceptional reason why it shouldn't work when ISAPNP is a > > module. > > > --- linux-2.4.19.orig/drivers/net/3c515.c 2002-02-25 19:37:59.000000000 +0000 > > +++ linux-2.4.19/drivers/net/3c515.c 2002-08-03 18:24:05.000000000 +0100 > > @@ -370,7 +370,7 @@ > > { "Default", 0, 0xFF, XCVR_10baseT, 10000}, > > }; > > > > -#ifdef CONFIG_ISAPNP > > +#if defined(CONFIG_ISAPNP) || defined (CONFIG_ISAPNP_MODULE) > > static struct isapnp_device_id corkscrew_isapnp_adapters[] = { > > { ISAPNP_ANY_ID, ISAPNP_ANY_ID, > > ISAPNP_VENDOR('T', 'C', 'M'), ISAPNP_FUNCTION(0x5051), > [...] > > It's really only obvious*ish*: If isapnp is a module but 3c515 built-in, > you'll get link errors. The real fix for this is to do > > +#ifdef __ISAPNP__ > > which will get all cases right. > > --Kai > > -- _______________________________________________ Get your free email from http://mymail.operamail.com Powered by Outblaze - 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/