patch-2.4.0-test2 linux/drivers/net/Makefile

• Lines: 27
• Date: Mon Jun 19 13:30:57 2000
• Orig file: v2.4.0-test1/linux/drivers/net/Makefile
• Orig date: Tue May 23 15:31:35 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/net/Makefile linux/drivers/net/Makefile
@@ -83,16 +83,8 @@
   endif
 endif
 
-ifeq ($(CONFIG_ISDN),y)
-  ifeq ($(CONFIG_ISDN_PPP),y)
-    obj-y += slhc.o ppp_deflate.o
-  endif
-else
-  ifeq ($(CONFIG_ISDN),m)
-    ifeq ($(CONFIG_ISDN_PPP),y)
-      obj-m += slhc.o ppp_deflate.o
-    endif
-  endif
+ifeq ($(CONFIG_ISDN_PPP),y)
+  obj-$(CONFIG_ISDN) += slhc.o
 endif
 
 ifeq ($(CONFIG_ARCNET),y)
@@ -240,6 +232,7 @@
 obj-$(CONFIG_EL16) += 3c507.o
 obj-$(CONFIG_ELMC) += 3c523.o
 obj-$(CONFIG_SKMC) += sk_mca.o
+obj-$(CONFIG_IBMLANA) += ibmlana.o
 obj-$(CONFIG_ELMC_II) += 3c527.o
 obj-$(CONFIG_EL3) += 3c509.o
 obj-$(CONFIG_3C515) += 3c515.o