diff options
author | Mikael Pettersson <mikpe@it.uu.se> | 2008-07-30 07:44:55 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-07-30 17:14:57 -0400 |
commit | d02a4e31ed0385eb34fe49f19d69a860a020ca3c (patch) | |
tree | cb9a13a9572995ee53649f9ef47e2a2d1e37eaf8 | |
parent | 4e891910f5fc7b94c720f587686636a88447c5e4 (diff) |
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>
-rw-r--r-- | drivers/net/ne.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ne.c b/drivers/net/ne.c index 2fec6122c7fa..42443d697423 100644 --- a/drivers/net/ne.c +++ b/drivers/net/ne.c | |||
@@ -536,7 +536,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr) | |||
536 | #ifdef CONFIG_NET_POLL_CONTROLLER | 536 | #ifdef CONFIG_NET_POLL_CONTROLLER |
537 | dev->poll_controller = eip_poll; | 537 | dev->poll_controller = eip_poll; |
538 | #endif | 538 | #endif |
539 | NS8390_init(dev, 0); | 539 | NS8390p_init(dev, 0); |
540 | 540 | ||
541 | ret = register_netdev(dev); | 541 | ret = register_netdev(dev); |
542 | if (ret) | 542 | if (ret) |
@@ -794,7 +794,7 @@ retry: | |||
794 | if (time_after(jiffies, dma_start + 2*HZ/100)) { /* 20ms */ | 794 | if (time_after(jiffies, dma_start + 2*HZ/100)) { /* 20ms */ |
795 | printk(KERN_WARNING "%s: timeout waiting for Tx RDC.\n", dev->name); | 795 | printk(KERN_WARNING "%s: timeout waiting for Tx RDC.\n", dev->name); |
796 | ne_reset_8390(dev); | 796 | ne_reset_8390(dev); |
797 | NS8390_init(dev,1); | 797 | NS8390p_init(dev, 1); |
798 | break; | 798 | break; |
799 | } | 799 | } |
800 | 800 | ||
@@ -855,7 +855,7 @@ static int ne_drv_resume(struct platform_device *pdev) | |||
855 | 855 | ||
856 | if (netif_running(dev)) { | 856 | if (netif_running(dev)) { |
857 | ne_reset_8390(dev); | 857 | ne_reset_8390(dev); |
858 | NS8390_init(dev, 1); | 858 | NS8390p_init(dev, 1); |
859 | netif_device_attach(dev); | 859 | netif_device_attach(dev); |
860 | } | 860 | } |
861 | return 0; | 861 | return 0; |