diff -Nur drivers/net.org/Config.in drivers/net/Config.in --- drivers/net.org/Config.in Mon Mar 26 14:11:32 2001 +++ drivers/net/Config.in Mon Mar 26 13:58:21 2001 @@ -100,6 +100,7 @@ if [ "$CONFIG_ISA" = "y" -o "$CONFIG_EISA" = "y" -o "$CONFIG_PCI" = "y" ]; then tristate ' HP 10/100VG PCLAN (ISA, EISA, PCI) support' CONFIG_HP100 fi + tristate ' RangeLAN2 support' CONFIG_RL2 dep_bool ' Other ISA cards' CONFIG_NET_ISA $CONFIG_ISA if [ "$CONFIG_NET_ISA" = "y" ]; then tristate ' Cabletron E21xx support' CONFIG_E2100 diff -Nur drivers/net.org/Makefile drivers/net/Makefile --- drivers/net.org/Makefile Sun Jan 7 04:45:14 2001 +++ drivers/net/Makefile Mon Mar 26 14:00:13 2001 @@ -36,10 +36,13 @@ subdir-$(CONFIG_APPLETALK) += appletalk subdir-$(CONFIG_SK98LIN) += sk98lin subdir-$(CONFIG_SKFP) += skfp +subdir-$(CONFIG_RL2) += rl2 # # link order important here # +obj-$(CONFIG_RL2) += rlmod.o + obj-$(CONFIG_PLIP) += plip.o obj-$(CONFIG_ROADRUNNER) += rrunner.o diff -Nur drivers/net.org/rl2/Makefile drivers/net/rl2/Makefile --- drivers/net.org/rl2/Makefile Mon Jan 8 17:30:18 2001 +++ drivers/net/rl2/Makefile Mon Mar 26 14:14:49 2001 @@ -1,192 +1,5 @@ -#------------------------------------------------------------------------- -# Nothing user configurable. 'make modules' automatically runs a -# configuration script. Do 'make config' to force a reconfiguration. -#------------------------------------------------------------------------- -SHELL = /bin/sh -MODNAME = rlmod.o -include config.mk +export-objs := lls.o qsm.o +O_TARGET := rlmod.o -#------------------------------------------------------------------------- -# For experimentation -#------------------------------------------------------------------------- -#dangerous to change to y!!! -SPOOF5V = n -NO_INT = y +include $(TOPDIR)/Rules.make -#------------------------------------------------------------------------- -# gcc Compiler options -#------------------------------------------------------------------------- -CFLAGS = -Wall -Wstrict-prototypes -#CFLAGS += -Werror -CFLAGS += -O2 -fomit-frame-pointer -pipe - -#------------------------------------------------------------------------- -# Linux specific options -#------------------------------------------------------------------------- -CFLAGS += -D__KERNEL__ -DMODULE -CFLAGS += -I${LINUXH} - -#------------------------------------------------------------------------- -# set per config.mk -#------------------------------------------------------------------------- -CFLAGS += -DCARDTYPE=${CARDTYPEVAL} -ifeq ($(BUFFER),y) - CFLAGS += -DBUFFER -endif -ifeq ($(PCCARD),y) - CFLAGS += -DPCCARD -I${PCCARDH} -endif -ifeq ($(CONFIG_MODVERSIONS),y) - CFLAGS += -DCONFIG_MODVERSIONS -include $(LINUXH)/linux/modversions.h -endif -ifeq ($(USBCARD),y) - LIBRARY = liblldusb.a - LINKLIB = lldusb - DO_USB = y - CFLAGS += -DUSBCARD -else - LIBRARY = liblld.a - LINKLIB = lld - DO_USB = n -endif -ifeq ($(SPOOF5V),y) - CFLAGS += -DSPOOF5V -endif -ifeq ($(NO_INT),y) - CFLAGS += -DNO_INT -endif -ifeq (diaglls.c,$(wildcard diaglls.c)) - CFLAGS += -DPROX_DIAG - DIAGLLS = diaglls.o - DO_DIAG = y - POSTDIAG = -diag - PROXDIAG = proxdiag -else - DO_DIAG = n -endif - -#------------------------------------------------------------------------- -# Revision info -#------------------------------------------------------------------------- -CLLDVERSION = 1.7 -ifeq ($(DO_DIAG),y) - VERSION = .1${POSTDIAG} -else - VERSION = .1 -endif -MKDATE = 01/08/01 -OWNER = Dave Koberstein \(davek@komacke.com\) -DISTNAME = rl2-${CLLDVERSION}${VERSION} -CFLAGS += -DRL2VERSION=\"${VERSION}\" - -#------------------------------------------------------------------------- -# Directives start here -#------------------------------------------------------------------------- -usage: - @echo "make