From 57445428488a2862840c4d7c96d7746c11031aaf Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 8 Aug 2000 19:25:53 +0000 Subject: Merge with Linu 2.4.0-test6-pre6. --- net/irda/Makefile | 2 -- net/irda/compressors/Makefile | 1 - net/irda/irlan/Makefile | 1 - 3 files changed, 4 deletions(-) (limited to 'net/irda') diff --git a/net/irda/Makefile b/net/irda/Makefile index ae3a793cf..ac2bdc063 100644 --- a/net/irda/Makefile +++ b/net/irda/Makefile @@ -19,8 +19,6 @@ O_OBJS := iriap.o iriap_event.o irlmp.o irlmp_event.o irlmp_frame.o \ discovery.o parameters.o OX_OBJS := irmod.o -MOD_LIST_NAME := IRDA_MODULES - ifeq ($(CONFIG_IRDA),m) M_OBJS := $(O_TARGET) endif diff --git a/net/irda/compressors/Makefile b/net/irda/compressors/Makefile index b7992289a..6d233020f 100644 --- a/net/irda/compressors/Makefile +++ b/net/irda/compressors/Makefile @@ -9,7 +9,6 @@ O_TARGET := O_OBJS := -MOD_LIST_NAME := IRDA_MODULES M_OBJS := ifeq ($(CONFIG_IRDA_DEFLATE),y) diff --git a/net/irda/irlan/Makefile b/net/irda/irlan/Makefile index 6d4cb8433..61285f23c 100644 --- a/net/irda/irlan/Makefile +++ b/net/irda/irlan/Makefile @@ -7,7 +7,6 @@ # # Note 2! The CFLAGS definition is now in the main makefile... -MOD_LIST_NAME := IRDA_MODULES O_TARGET := irlan.o O_OBJS := irlan_common.o irlan_eth.o irlan_event.o irlan_client.o irlan_provider.o irlan_filter.o irlan_provider_event.o irlan_client_event.o M_OBJS := $(O_TARGET) -- cgit v1.2.3