summaryrefslogtreecommitdiffstats
path: root/drivers/net/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
commitdb7d4daea91e105e3859cf461d7e53b9b77454b2 (patch)
tree9bb65b95440af09e8aca63abe56970dd3360cc57 /drivers/net/Makefile
parent9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff)
Merge with Linux 2.2.8.
Diffstat (limited to 'drivers/net/Makefile')
-rw-r--r--drivers/net/Makefile27
1 files changed, 26 insertions, 1 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 22fe2bae3..4349b49f9 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -430,6 +430,14 @@ else
endif
endif
+ifeq ($(CONFIG_SUNBMAC),y)
+L_OBJS += sunbmac.o
+else
+ ifeq ($(CONFIG_SUNBMAC),m)
+ M_OBJS += sunbmac.o
+ endif
+endif
+
ifeq ($(CONFIG_MYRI_SBUS),y)
L_OBJS += myri_sbus.o
else
@@ -478,6 +486,14 @@ else
endif
endif
+ifeq ($(CONFIG_ELMC_II),y)
+L_OBJS += 3c527.o
+else
+ ifeq ($(CONFIG_ELMC_II),m)
+ M_OBJS += 3c527.o
+ endif
+endif
+
ifeq ($(CONFIG_EL3),y)
L_OBJS += 3c509.o
else
@@ -1005,10 +1021,18 @@ endif
ifeq ($(CONFIG_MACE),y)
L_OBJS += mace.o
+else
+ ifeq ($(CONFIG_MACE),m)
+ M_OBJS += mace.o
+ endif
endif
ifeq ($(CONFIG_BMAC),y)
L_OBJS += bmac.o
+else
+ ifeq ($(CONFIG_BMAC),m)
+ M_OBJS += bmac.o
+ endif
endif
ifeq ($(CONFIG_VENDOR_SANGOMA),y)
@@ -1062,9 +1086,10 @@ endif
ifeq ($(CONFIG_IRDA),y)
SUB_DIRS += irda
+MOD_IN_SUB_DIRS += irda
else
ifeq ($(CONFIG_IRDA),m)
- MOD_SUB_DIRS += irda
+ MOD_IN_SUB_DIRS += irda
endif
endif