Import 2.3.18pre1

[davej-history.git] / drivers / net / Makefile

diff --git a/drivers/net/Makefileb/drivers/net/Makefile
index 88aca46..3640e78 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -5,7+5,7 @@
 
 SUB_DIRS     := 
 MOD_SUB_DIRS := $(SUB_DIRS)
-ALL_SUB_DIRS := $(SUB_DIRS) hamradio irda fc
+ALL_SUB_DIRS := $(SUB_DIRS) hamradio irda fc pcmcia
 
 L_TARGET := net.a
 L_OBJS   := auto_irq.o
@@ -29,6+29,11 @@ CONFIG_85230_MODULE  :=
 CONFIG_SYNCPPP_BUILTIN :=
 CONFIG_SYNCPPP_MODULE  :=
 
+ifneq ($(CONFIG_PCMCIA),n)
+  SUB_DIRS += pcmcia
+  MOD_SUB_DIRS += pcmcia
+endif
+
 ifeq ($(CONFIG_ISDN),y)
   ifeq ($(CONFIG_ISDN_PPP),y)
     CONFIG_SLHC_BUILTIN = y
@@ -1119,6+1124,14 @@ else
   endif
 endif
 
+ifeq ($(CONFIG_ADAPTEC_STARFIRE),y)
+L_OBJS += starfire.o
+else
+  ifeq ($(CONFIG_ADAPTEC_STARFIRE),m)
+  M_OBJS += starfire.o
+  endif
+endif
+
 ifeq ($(CONFIG_VENDOR_SANGOMA),y)
   LX_OBJS += sdladrv.o
   L_OBJS += sdlamain.o