[PATCH] Makefile fix for FORE 200e and a typo in lec.c

Jan Rekorajski (baggins@sith.mimuw.edu.pl)
Tue, 2 Jan 2001 12:41:42 +0100


Hi,
The Fore dirver in 2.4.0-prerelease just does not build
with the current makefile. This patch fixes it (works for me):

--- linux/drivers/atm/Makefile.orig Tue Jan 2 10:18:25 2001
+++ linux/drivers/atm/Makefile Tue Jan 2 12:00:05 2001
@@ -46,7 +46,7 @@
endif
endif

-obj-$(CONFIG_ATM_FORE200E) += fore200e.o $(FORE200E_FW_OBJS)
+obj-$(CONFIG_ATM_FORE200E) += fore_200e.o

include $(TOPDIR)/Rules.make

Second thing, there is a typo in net/atm/lec.c:

--- linux/net/atm/lec.c.orig Sat Dec 30 20:19:13 2000
+++ linux/net/atm/lec.c Tue Jan 2 12:06:34 2001
@@ -857,7 +857,7 @@
for (i = 0; i < MAX_LEC_ITF; i++) {
if (dev_lec[i] != NULL) {
priv = (struct lec_priv *)dev_lec[i]->priv;
- unregister_trdev(dev_lec[i]);
+ unregister_netdev(dev_lec[i]);
kfree(dev_lec[i]);
dev_lec[i] = NULL;
}

And, just in case you missed it, modular LEC fix:

--- linux/net/atm/Makefile.orig Sun Dec 31 17:57:15 2000
+++ linux/net/atm/Makefile Sun Dec 31 19:04:49 2000
@@ -33,7 +33,13 @@
obj-y += proc.o
endif

-obj-$(CONFIG_ATM_LANE) += lec.o lane_mpoa_init.o
+ifneq ($(CONFIG_ATM_LANE),n)
+ifneq ($(CONFIG_ATM_LANE),)
+obj-y += lane_mpoa_init.o
+endif
+endif
+
+obj-$(CONFIG_ATM_LANE) += lec.o
obj-$(CONFIG_ATM_MPOA) += mpoa.o

include $(TOPDIR)/Rules.make

Jan

-- 
Jan Rêkorajski            |  ALL SUSPECTS ARE GUILTY. PERIOD!
baggins<at>mimuw.edu.pl   |  OTHERWISE THEY WOULDN'T BE SUSPECTS, WOULD THEY?
BOFH, MANIAC              |                   -- TROOPS by Kevin Rubio
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/