[patch] fix 3c515.c:(.text+0x57200): undefined reference to`pnp_get_resource'

[Ingo Molnar]

commit 2538003ce2ea0b936d273692bc4e51c5b52fe70d
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Fri Jun 20 11:29:31 2008 +0200

    fix 3c515.c:(.text+0x57200): undefined reference to `pnp_get_resource'
    
    -tip testing found the following build failure:
    
      drivers/built-in.o: In function `corkscrew_setup':
      3c515.c:(.text+0x57200): undefined reference to `pnp_get_resource'
    
    which happens if 3c515.c is build without CONFIG_PNP:
    
      http://redhat.com/~mingo/misc/config-Fri_Jun_20_10_02_43_CEST_2008.bad
    
    the reason is pnp_irq() use outside of its __ISAPNP__ section.
    
    corkscrew_setup() always called with NULL in the !__ISAPNP__ case, but
    also check this condition to make sure.
    
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 105a8c7..09dd063 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -573,7 +573,12 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
 	DECLARE_MAC_BUF(mac);
 
 	if (idev) {
+#ifdef __ISAPNP__
 		irq = pnp_irq(idev, 0);
+#else
+		/* Can not happen - in the !PNP case we always pass in NULL */
+		BUG_ON(1);
+#endif
 		vp->dev = &idev->dev;
 	} else {
 		irq = inw(ioaddr + 0x2002) & 15;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/