mirror of
https://github.com/torvalds/linux.git
synced 2024-11-25 21:51:40 +00:00
fix NE2000 linkage error
Trying to build with CONFIG_NE2000=m fails with: scripts/mod/modpost -o /tmp/tmp/linux-2.6.27-rc1/Module.symvers -S -s ERROR: "NS8390_init" [drivers/net/ne.ko] undefined! This is because the split of 8390 into pausing and non-pausing versions was incompletely propagated to ne.c. This fixes it. Signed-off-by: Mikael Pettersson <mikpe@it.uu.se> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
parent
4e891910f5
commit
d02a4e31ed
@ -536,7 +536,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
|
||||
#ifdef CONFIG_NET_POLL_CONTROLLER
|
||||
dev->poll_controller = eip_poll;
|
||||
#endif
|
||||
NS8390_init(dev, 0);
|
||||
NS8390p_init(dev, 0);
|
||||
|
||||
ret = register_netdev(dev);
|
||||
if (ret)
|
||||
@ -794,7 +794,7 @@ retry:
|
||||
if (time_after(jiffies, dma_start + 2*HZ/100)) { /* 20ms */
|
||||
printk(KERN_WARNING "%s: timeout waiting for Tx RDC.\n", dev->name);
|
||||
ne_reset_8390(dev);
|
||||
NS8390_init(dev,1);
|
||||
NS8390p_init(dev, 1);
|
||||
break;
|
||||
}
|
||||
|
||||
@ -855,7 +855,7 @@ static int ne_drv_resume(struct platform_device *pdev)
|
||||
|
||||
if (netif_running(dev)) {
|
||||
ne_reset_8390(dev);
|
||||
NS8390_init(dev, 1);
|
||||
NS8390p_init(dev, 1);
|
||||
netif_device_attach(dev);
|
||||
}
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user