patch-2.2.15 linux/drivers/net/irda/Makefile

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

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/drivers/net/irda/Makefile linux/drivers/net/irda/Makefile
@@ -21,34 +21,18 @@
 endif
 
 ifeq ($(CONFIG_IRPORT_SIR),y)
-L_OBJS += irport.o
+LX_OBJS += irport.o
 else
   ifeq ($(CONFIG_IRPORT_SIR),m)
-  M_OBJS += irport.o
-  endif
-endif
-
-ifeq ($(CONFIG_IRPORT_SIR),y)
-L_OBJS += irport.o
-else
-  ifeq ($(CONFIG_IRPORT_SIR),m)
-  M_OBJS += irport.o
-  endif
-endif
-
-ifeq ($(CONFIG_IRPORT_SIR),y)
-L_OBJS += irport.o
-else
-  ifeq ($(CONFIG_IRPORT_SIR),m)
-  M_OBJS += irport.o
+  MX_OBJS += irport.o
   endif
 endif
 
 ifeq ($(CONFIG_NSC_FIR),y)
-L_OBJS += pc87108.o
+L_OBJS += nsc-ircc.o
 else
   ifeq ($(CONFIG_NSC_FIR),m)
-  M_OBJS += pc87108.o
+  M_OBJS += nsc-ircc.o
   endif
 endif
 
@@ -60,14 +44,6 @@
   endif
 endif
 
-ifeq ($(CONFIG_SHARP_FIR),y)
-L_OBJS += uircc.o irport.o
-else
-  ifeq ($(CONFIG_SHARP_FIR),m)
-  M_OBJS += uircc.o irport.o
-  endif
-endif
-
 ifeq ($(CONFIG_TOSHIBA_FIR),y)
 L_OBJS += toshoboe.o
 else
@@ -93,10 +69,12 @@
 endif
 
 ifeq ($(CONFIG_SMC_IRCC_FIR),y)
-L_OBJS += irport.o smc-ircc.o
+L_OBJS += smc-ircc.o
+LX_OBJS += irport.o
 else
   ifeq ($(CONFIG_SMC_IRCC_FIR),m)
-  M_OBJS += irport.o smc-ircc.o
+  M_OBJS += smc-ircc.o
+  MX_OBJS += irport.o
   endif
 endif
 
@@ -137,6 +115,14 @@
 else
   ifeq ($(CONFIG_LITELINK_DONGLE),m)
   M_OBJS += litelink.o
+  endif
+endif
+
+ifeq ($(CONFIG_OLD_BELKIN_DONGLE),y)
+L_OBJS += old_belkin.o
+else
+  ifeq ($(CONFIG_OLD_BELKIN_DONGLE),m)
+  M_OBJS += old_belkin.o
   endif
 endif
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)