With 2.4.0 thru 2.4.1-pre8 (could possibly be sooner than 2.4.0)

PCMCIA_CONFIG_NETCARD is getting defined with CONFIG_PCMCIA, even when no
PCMCIA net cards are selected:


    458 # PCMCIA network device support
    459 #
    460 CONFIG_NET_PCMCIA=y
    461 # CONFIG_PCMCIA_NETCARD is not set

This causes the nonexistant drivers/net/pcmcia/pcmcia_net.o to try to be
linked.  It looks like this is hepenning because CONFIG_NET_PCMCIA is
defined, but then CONFIG_PCMCIA_NETCARD is defined elsewhere.

A patch is attached.

-dwild
--- linux-2.4.0/drivers/net/pcmcia/Config.in.orig       Wed Jan 17 20:49:24 2001
+++ linux-2.4.0/drivers/net/pcmcia/Config.in    Wed Jan 17 20:51:37 2001
@@ -5,8 +5,8 @@
 mainmenu_option next_comment
 comment 'PCMCIA network device support'
 
-bool 'PCMCIA network device support' CONFIG_NET_PCMCIA
-if [ "$CONFIG_NET_PCMCIA" = "y" ]; then
+bool 'PCMCIA network device support' CONFIG_PCMCIA_NETCARD
+if [ "$CONFIG_PCMCIA_NETCARD" = "y" ]; then
    dep_tristate '  3Com 3c589 PCMCIA support' CONFIG_PCMCIA_3C589 $CONFIG_PCMCIA
    dep_tristate '  3Com 3c574 PCMCIA support' CONFIG_PCMCIA_3C574 $CONFIG_PCMCIA
    dep_tristate '  Fujitsu FMV-J18x PCMCIA support' CONFIG_PCMCIA_FMVJ18X 
$CONFIG_PCMCIA
@@ -31,14 +31,4 @@
       dep_tristate '    Aironet 4500/4800 PCMCIA support' CONFIG_AIRONET4500_CS 
$CONFIG_AIRONET4500 $CONFIG_PCMCIA
    fi
 fi
-
-if [ "$CONFIG_PCMCIA_3C589" = "y" -o "$CONFIG_PCMCIA_3C574" = "y" -o \
-     "$CONFIG_PCMCIA_FMVJ18X" = "y" -o "$CONFIG_PCMCIA_PCNET" = "y" -o \
-     "$CONFIG_PCMCIA_NMCLAN" = "y" -o "$CONFIG_PCMCIA_SMC91C92" = "y" -o \
-     "$CONFIG_PCMCIA_XIRC2PS" = "y" -o "$CONFIG_PCMCIA_RAYCS" = "y" -o \
-     "$CONFIG_PCMCIA_NETWAVE" = "y" -o "$CONFIG_PCMCIA_WAVELAN" = "y" -o \
-     "$CONFIG_PCMCIA_XIRTULIP" = "y" ]; then
-   define_bool CONFIG_PCMCIA_NETCARD y
-fi
-
 endmenu

Reply via email to