patch-2.1.68 linux/drivers/net/Makefile

Next file: linux/drivers/net/at1700.c
Previous file: linux/drivers/net/Config.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.67/linux/drivers/net/Makefile linux/drivers/net/Makefile
@@ -73,13 +73,6 @@
 L_OBJS += sk_g16.o
 endif
 
-ifeq ($(CONFIG_NET_IPIP),y)
-L_OBJS += tunnel.o
-else
-  ifeq ($(CONFIG_NET_IPIP),m)
-  M_OBJS += tunnel.o
-  endif
-endif
 
 ifeq ($(CONFIG_HP100),y)
 L_OBJS += hp100.o
@@ -735,13 +728,33 @@
   endif
 endif
 
-ifeq ($(CONFIG_BAYCOM),y)
-L_OBJS += baycom.o
+ifeq ($(CONFIG_BAYCOM_SER_FDX),y)
+L_OBJS += baycom_ser_fdx.o
+CONFIG_HDLCDRV_BUILTIN = y
+else
+  ifeq ($(CONFIG_BAYCOM_SER_FDX),m)
+  CONFIG_HDLCDRV_MODULE = y
+  M_OBJS += baycom_ser_fdx.o
+  endif
+endif
+
+ifeq ($(CONFIG_BAYCOM_SER_HDX),y)
+L_OBJS += baycom_ser_hdx.o
+CONFIG_HDLCDRV_BUILTIN = y
+else
+  ifeq ($(CONFIG_BAYCOM_SER_HDX),m)
+  CONFIG_HDLCDRV_MODULE = y
+  M_OBJS += baycom_ser_hdx.o
+  endif
+endif
+
+ifeq ($(CONFIG_BAYCOM_PAR),y)
+L_OBJS += baycom_par.o
 CONFIG_HDLCDRV_BUILTIN = y
 else
-  ifeq ($(CONFIG_BAYCOM),m)
+  ifeq ($(CONFIG_BAYCOM_PAR),m)
   CONFIG_HDLCDRV_MODULE = y
-  M_OBJS += baycom.o
+  M_OBJS += baycom_par.o
   endif
 endif
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov