On Friday 16 May 2008 11:35:24 am Randy Dunlap wrote:
quoted text
> 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>

quoted text
> ---
>  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;
> 


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html