Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d02a4e31 authored by Mikael Pettersson's avatar Mikael Pettersson Committed by Jeff Garzik
Browse files

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: default avatarMikael Pettersson <mikpe@it.uu.se>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 4e891910

drivers/net/ne.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -536,7 +536,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr) 
#ifdef CONFIG_NET_POLL_CONTROLLER

#ifdef CONFIG_NET_POLL_CONTROLLER

	dev->poll_controller = eip_poll;

	dev->poll_controller = eip_poll;

#endif

#endif

	NS8390_init(dev, 0);

	NS8390p_init(dev, 0);





	ret = register_netdev(dev);

	ret = register_netdev(dev);

	if (ret)

	if (ret)
@@ -794,7 +794,7 @@ static void ne_block_output(struct net_device *dev, int count, 
		if (time_after(jiffies, dma_start + 2*HZ/100)) {		/* 20ms */

		if (time_after(jiffies, dma_start + 2*HZ/100)) {		/* 20ms */

			printk(KERN_WARNING "%s: timeout waiting for Tx RDC.\n", dev->name);

			printk(KERN_WARNING "%s: timeout waiting for Tx RDC.\n", dev->name);

			ne_reset_8390(dev);

			ne_reset_8390(dev);

			NS8390_init(dev,1);

			NS8390p_init(dev, 1);

			break;

			break;

		}

		}
@@ -855,7 +855,7 @@ static int ne_drv_resume(struct platform_device *pdev) 




	if (netif_running(dev)) {

	if (netif_running(dev)) {

		ne_reset_8390(dev);

		ne_reset_8390(dev);

		NS8390_init(dev, 1);

		NS8390p_init(dev, 1);

		netif_device_attach(dev);

		netif_device_attach(dev);

	}

	}

	return 0;

	return 0;