patch-2.3.23 linux/drivers/net/Makefile

• Lines: 28
• Date: Wed Oct 20 21:33:12 1999
• Orig file: v2.3.22/linux/drivers/net/Makefile
• Orig date: Fri Oct 15 15:25:13 1999

diff -u --recursive --new-file v2.3.22/linux/drivers/net/Makefile linux/drivers/net/Makefile
@@ -27,10 +27,10 @@
 
 ifeq ($(CONFIG_PCMCIA),y)
   SUB_DIRS += pcmcia
-  MOD_SUB_DIRS += pcmcia
+  MOD_IN_SUB_DIRS += pcmcia
 else
   ifeq ($(CONFIG_PCMCIA),m)
-    MOD_SUB_DIRS += pcmcia
+    MOD_IN_SUB_DIRS += pcmcia
   endif
 endif
 
@@ -825,14 +825,6 @@
 else
   ifeq ($(CONFIG_ARIADNE2),m)
   M_OBJS += ariadne2.o
-  CONFIG_8390_MODULE = y
-  endif
-endif
-
-ifeq ($(CONFIG_PCMCIA_PCNET),y)
-CONFIG_8390_BUILTIN = y
-else
-  ifeq ($(CONFIG_PCMCIA_PCNET),m)
   CONFIG_8390_MODULE = y
   endif
 endif