[PATCH] multiple definition of `__ksymtab_NS8390_init'

From: Paul Gortmaker (p_gortmaker@yahoo.com)
Date: Sun Jul 09 2000 - 02:43:14 EST


For those that missed it, the definitions in netsyms.c are to go.

Thanks to all who reported it. Patch against test3-pre6.

Paul.

--- linux/net/netsyms.c~ Fri Jul 7 03:45:56 2000
+++ linux/net/netsyms.c Sun Jul 9 03:13:29 2000
@@ -69,17 +69,6 @@
 
 #include <linux/rtnetlink.h>
 
-#if defined(CONFIG_ULTRA) || defined(CONFIG_WD80x3) || \
- defined(CONFIG_EL2) || defined(CONFIG_NE2000) || \
- defined(CONFIG_E2100) || defined(CONFIG_HPLAN_PLUS) || \
- defined(CONFIG_HPLAN) || defined(CONFIG_AC3200) || \
- defined(CONFIG_ES3210) || defined(CONFIG_ULTRA32) || \
- defined(CONFIG_LNE390) || defined(CONFIG_NE3210) || \
- defined(CONFIG_NE2K_PCI) || defined(CONFIG_APNE) || \
- defined(CONFIG_DAYNAPORT)
-#include "../drivers/net/8390.h"
-#endif
-
 #ifdef CONFIG_IPX_MODULE
 extern struct datalink_proto *make_EII_client(void);
 extern struct datalink_proto *make_8023_client(void);
@@ -435,22 +424,6 @@
 EXPORT_SYMBOL(arp_find);
 
 #endif /* CONFIG_INET */
-
-#if defined(CONFIG_ULTRA) || defined(CONFIG_WD80x3) || \
- defined(CONFIG_EL2) || defined(CONFIG_NE2000) || \
- defined(CONFIG_E2100) || defined(CONFIG_HPLAN_PLUS) || \
- defined(CONFIG_HPLAN) || defined(CONFIG_AC3200) || \
- defined(CONFIG_ES3210) || defined(CONFIG_ULTRA32) || \
- defined(CONFIG_LNE390) || defined(CONFIG_NE3210) || \
- defined(CONFIG_NE2K_PCI) || defined(CONFIG_APNE) || \
- defined(CONFIG_DAYNAPORT)
-/* If 8390 NIC support is built in, we will need these. */
-EXPORT_SYMBOL(ei_open);
-EXPORT_SYMBOL(ei_close);
-EXPORT_SYMBOL(ei_interrupt);
-EXPORT_SYMBOL(ethdev_init);
-EXPORT_SYMBOL(NS8390_init);
-#endif
 
 #ifdef CONFIG_TR
 EXPORT_SYMBOL(tr_setup);

__________________________________________________
Do You Yahoo!?
Talk to your friends online with Yahoo! Messenger.
http://im.yahoo.com

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sat Jul 15 2000 - 21:00:09 EST