Re: [2.4.0-rerelease] driver/net/Makefile bug (pcmcia)

Kai Germaschewski (kai@thphy.uni-duesseldorf.de)
Tue, 2 Jan 2001 12:54:08 +0100 (CET)


On Tue, 2 Jan 2001, Andreas Jellinghaus wrote:

> modules for pcmcia network cards are not build by the kernel.

I just tried, and I don't see this problem. What's your .config?

> subdir-$(CONFIG_PCMCIA) += pcmcia
>
> should be
>
> ifeq ($(CONFIG_PCMCIA),y)
> subdir-y += pcmcia
> subdir-m += pcmcia
> endif
>
> because CONFIG_PCMCIA=y but CONFIG_PCMCIA_SOMENETWORKDRIVER=m

No, pcmcia is in $(mod-subdirs), which leads to "make" entering
drivers/net/pcmcia when MAKING_MODULES, even if pcmcia is only in
$(subdir-y).

BTW: CONFIG_PCMCIA is a tristate, so the above would break
CONFIG_PCMCIA=m.

> maybe even bett is useing CONFIG_NET_PCMCIA instead of CONFIG_PCMCIA.

Yes, that makes sense to me.
Proposed patch:

diff -ur linux-2.4.0-prerelease-diff/drivers/net/Makefile linux-2.4.0-prerelease-diff.work/drivers/net/Makefile
--- linux-2.4.0-prerelease-diff/drivers/net/Makefile Tue Jan 2 12:26:45 2001
+++ linux-2.4.0-prerelease-diff.work/drivers/net/Makefile Tue Jan 2 12:50:42 2001
@@ -26,7 +26,7 @@
obj-$(CONFIG_ISDN) += slhc.o
endif

-subdir-$(CONFIG_PCMCIA) += pcmcia
+subdir-$(CONFIG_NET_PCMCIA) += pcmcia
subdir-$(CONFIG_TULIP) += tulip
subdir-$(CONFIG_IRDA) += irda
subdir-$(CONFIG_TR) += tokenring

[This doesn't fix any bugs, but it slightly optimizes the build process
because drivers/net/pcmcia will only be entered when PCMCIA net drivers
are selected]

--Kai

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