small prob. with pcmcia Makefile in 2.4.20

Hello,

I have found a small problem with the pcmcia Makefile in 2.4.20. It seems that drivers/net/pcmcia/smc91c92_cs.c has a dependency on drivers/net/mii.c. I played with the Makefile and came up with the following two solutions:

1. -make the following sym. link:

ln -s drivers/net/mii.c drivers/net/pcmcia/mii.c

-apply the following patch:

@@ -12,7 +12,7 @@
 obj-           :=
 
 # Things that need to export symbols
-export-objs    := ray_cs.o
+export-objs    := ray_cs.o mii.o
 
 # 16-bit client drivers
 obj-$(CONFIG_PCMCIA_3C589)     += 3c589_cs.o

@@ -20,7 +20,7 @@
 obj-$(CONFIG_PCMCIA_FMVJ18X)   += fmvj18x_cs.o
 obj-$(CONFIG_PCMCIA_NMCLAN)    += nmclan_cs.o
 obj-$(CONFIG_PCMCIA_PCNET)     += pcnet_cs.o
-obj-$(CONFIG_PCMCIA_SMC91C92)  += smc91c92_cs.o
+obj-$(CONFIG_PCMCIA_SMC91C92)  += smc91c92_cs.o mii.o
 obj-$(CONFIG_PCMCIA_XIRC2PS)   += xirc2ps_cs.o
 obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o
 obj-$(CONFIG_PCMCIA_AXNET)     += axnet_cs.o

2. -apply the following patch:

@@ -12,7 +12,7 @@
 obj-           :=
 
 # Things that need to export symbols
-export-objs    := ray_cs.o
+export-objs    := ray_cs.o ../mii.o
 
 # 16-bit client drivers
 obj-$(CONFIG_PCMCIA_3C589)     += 3c589_cs.o

@@ -20,7 +20,7 @@
 obj-$(CONFIG_PCMCIA_FMVJ18X)   += fmvj18x_cs.o
 obj-$(CONFIG_PCMCIA_NMCLAN)    += nmclan_cs.o
 obj-$(CONFIG_PCMCIA_PCNET)     += pcnet_cs.o
-obj-$(CONFIG_PCMCIA_SMC91C92)  += smc91c92_cs.o
+obj-$(CONFIG_PCMCIA_SMC91C92)  += smc91c92_cs.o mii.o
 obj-$(CONFIG_PCMCIA_XIRC2PS)   += xirc2ps_cs.o
 obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o
 obj-$(CONFIG_PCMCIA_AXNET)     += axnet_cs.o

The problem with these solutions is that if a PCI card that uses mii.c is selected along with smc91c92_cs.c than two copies of mii.o will be built. I don't know what will happen if the driver is built into the kernel. I can't seem to find a solution that fixes this problem. It seems to me that this problem exists because mii.c is in a different directory.

Does anyone have any suggestions on how to fix this?

Please cc me as I'm not on the list.

Ben

<snip>

The fix was posted yesterday on this list by Adrian Bunk:

--- linux-2.4.20-test/drivers/net/Makefile.old 2002-11-29 17:46:47.000000000 +0100
+++ linux-2.4.20-test/drivers/net/Makefile 2002-11-29 17:47:22.000000000
+0100
@@ -122,6 +122,7 @@
obj-$(CONFIG_MAC8390) += daynaport.o 8390.o
obj-$(CONFIG_APNE) += apne.o 8390.o
obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
+obj-$(CONFIG_PCMCIA_SMC91C92) += mii.o
obj-$(CONFIG_SHAPER) += shaper.o
obj-$(CONFIG_SK_G16) += sk_g16.o
obj-$(CONFIG_HP100) += hp100.o

    GertJan