Re: Problems with 2.3.26 Makefile, PCMCIA

Keith Owens (kaos@ocs.com.au)
Wed, 10 Nov 1999 13:50:12 +1100


On Tue, 9 Nov 1999 16:44:11 -0500 (EST),
sfoskett@sidehack.sat.gweep.net wrote:
>I think I've found a problem with the main kernel Makefile in 2.3.26 at least,
>and probably previous versions as well. It manifests itself by putting any
>PCMCIA network card modules into /lib/modules/2.3.26/misc instead of pcmcia.

Untested but "obviously correct". Against 2.3.26.

Index: 26.6/Makefile
--- 26.6/Makefile Wed, 10 Nov 1999 02:37:13 +1100 keith (linux-2.3/M/b/40_Makefile 1.7.1.21 644)
+++ 26.6(w)/Makefile Wed, 10 Nov 1999 13:39:19 +1100 keith (linux-2.3/M/b/40_Makefile 1.7.1.21 644)
@@ -363,6 +363,7 @@
if [ -f IRDA_MODULES ]; then inst_mod IRDA_MODULES net; fi; \
if [ -f USB_MODULES ]; then inst_mod USB_MODULES usb; fi; \
if [ -f PCMCIA_MODULES ]; then inst_mod PCMCIA_MODULES pcmcia; fi; \
+ if [ -f PCMCIA_NET_MODULES ]; then inst_mod PCMCIA_NET_MODULES pcmcia; fi; \
\
ls *.o > $$MODLIB/.allmods; \
echo $$MODULES | tr ' ' '\n' | sort | comm -23 $$MODLIB/.allmods - > $$MODLIB/.misc; \
Index: 26.6/drivers/net/pcmcia/Makefile
--- 26.6/drivers/net/pcmcia/Makefile Sat, 23 Oct 1999 15:35:04 +1000 keith (linux-2.3/g/c/24_Makefile 1.3 644)
+++ 26.6(w)/drivers/net/pcmcia/Makefile Wed, 10 Nov 1999 13:38:36 +1100 keith (linux-2.3/g/c/24_Makefile 1.3 644)
@@ -11,7 +11,7 @@
O_TARGET := pcmcia_net.o
O_OBJS :=
M_OBJS :=
-MOD_LIST_NAME := PCMCIA_MODULES
+MOD_LIST_NAME := PCMCIA_NET_MODULES

#CFLAGS_3c575_cb.o = -DCARDBUS
#CFLAGS_tulip_cb.o = -DCARDBUS

>I've also ported the serial_cs.c module from pcmcia 3.1.1 to kernel 2.3.26
>(no big deal, really) but I'm not sure where to put it in the kernel tree.
>I guess drivers/pcmcia would be the right place.

The pcmcia net drivers are in drivers/net/pcmcia. To be consistent,
serial_cs.c would be in drivers/serial/pcmcia. MEC, does that make
sense or is it overkill?

-
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/