patch-2.1.15 linux/drivers/net/Makefile

• Lines: 69
• Date: Thu Dec 12 16:51:09 1996
• Orig file: v2.1.14/linux/drivers/net/Makefile
• Orig date: Tue Nov 19 15:53:55 1996

diff -u --recursive --new-file v2.1.14/linux/drivers/net/Makefile linux/drivers/net/Makefile
@@ -49,15 +49,23 @@
   endif
 endif
 
+ifeq ($(CONFIG_SHAPER),y)
+L_OBJS += shaper.o
+else
+  ifeq ($(CONFIG_SHAPER),m)
+  M_OBJS += shaper.o
+  endif
+endif
+
 ifeq ($(CONFIG_SK_G16),y)
 L_OBJS += sk_g16.o
 endif
 
 ifeq ($(CONFIG_NET_IPIP),y)
-L_OBJS += new_tunnel.o
+L_OBJS += tunnel.o
 else
   ifeq ($(CONFIG_NET_IPIP),m)
-  M_OBJS += new_tunnel.o
+  M_OBJS += tunnel.o
   endif
 endif
 
@@ -139,6 +147,9 @@
 ifeq ($(CONFIG_ULTRA),y)
 L_OBJS += smc-ultra.o
 CONFIG_8390_BUILTIN = y
+  ifeq ($(CONFIG_MCA),y)
+  L_OBJS += smc-mca.o
+  endif
 else
   ifeq ($(CONFIG_ULTRA),m)
   CONFIG_8390_MODULE = y
@@ -156,6 +167,17 @@
   endif
 endif
 
+ifeq ($(CONFIG_ES3210),y)
+L_OBJS += es3210.o
+CONFIG_8390_BUILTIN = y
+else
+  ifeq ($(CONFIG_ES3210),m)
+  CONFIG_8390_MODULE = y
+  M_OBJS += es3210.o
+  endif
+endif
+
+
 ifeq ($(CONFIG_PLIP),y)
 L_OBJS += plip.o
 else
@@ -289,6 +311,14 @@
 else
   ifeq ($(CONFIG_EL16),m)
   M_OBJS += 3c507.o
+  endif
+endif
+
+ifeq ($(CONFIG_ELMC),y)
+L_OBJS += 3c523.o
+else
+  ifeq ($(CONFIG_ELMC),m)
+  M_OBJS += 3c523.o
   endif
 endif