From: Bjorn Helgaas <bjorn.helgaas@hp.com>
To: Randy Dunlap <randy.dunlap@oracle.com>
Cc: netdev <netdev@vger.kernel.org>, jgarzik <jgarzik@pobox.com>,
linux-next@vger.kernel.org, akpm <akpm@linux-foundation.org>
Subject: Re: [PATCH -next] 3c515: fix using pnp_get_resource when CONFIG_ISAPNP=n
Date: Fri, 16 May 2008 12:15:05 -0600 [thread overview]
Message-ID: <200805161215.06046.bjorn.helgaas@hp.com> (raw)
In-Reply-To: <20080516103524.0b00ffb6.randy.dunlap@oracle.com>
On Friday 16 May 2008 11:35:24 am Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> 3c515.c uses pnp_irq(), which calls pnp_get_resource(),
> which is not defined when CONFIG_PNP=n, so in that case,
> get the IRQ from a hardware register.
>
> 3c515.c:(.text+0x3adc0): undefined reference to `pnp_get_resource'
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Hmm, wonder why my allyesconfig didn't catch this one.
I prefer CONFIG_PNP to __ISAPNP__ in general, but I see
you're just following the other tests in the same file.
Thanks!
Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
> ---
> drivers/net/3c515.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> --- next-20080516.orig/drivers/net/3c515.c
> +++ next-20080516/drivers/net/3c515.c
> @@ -572,12 +572,16 @@ static int corkscrew_setup(struct net_de
> int irq;
> DECLARE_MAC_BUF(mac);
>
> +#ifdef __ISAPNP__
> if (idev) {
> irq = pnp_irq(idev, 0);
> vp->dev = &idev->dev;
> } else {
> irq = inw(ioaddr + 0x2002) & 15;
> }
> +#else
> + irq = inw(ioaddr + 0x2002) & 15;
> +#endif
>
> dev->base_addr = ioaddr;
> dev->irq = irq;
>
next prev parent reply other threads:[~2008-05-16 18:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-16 17:35 [PATCH -next] 3c515: fix using pnp_get_resource when CONFIG_ISAPNP=n Randy Dunlap
2008-05-16 18:15 ` Bjorn Helgaas [this message]
2008-05-16 18:21 ` Randy Dunlap
2008-05-16 18:58 ` Bjorn Helgaas
2008-05-22 11:09 ` Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200805161215.06046.bjorn.helgaas@hp.com \
--to=bjorn.helgaas@hp.com \
--cc=akpm@linux-foundation.org \
--cc=jgarzik@pobox.com \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=randy.dunlap@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).