diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
| commit | 57445428488a2862840c4d7c96d7746c11031aaf (patch) | |
| tree | 60b88b3a21896a33ee4dccc727d88b745a9ff731 /net/ipv6 | |
| parent | 2e837819b1563679b55363d469239fdf4f17fbbb (diff) | |
Merge with Linu 2.4.0-test6-pre6.
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/Makefile | 1 | ||||
| -rw-r--r-- | net/ipv6/netfilter/Makefile | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile index e64706e83..23754e3d3 100644 --- a/net/ipv6/Makefile +++ b/net/ipv6/Makefile @@ -14,7 +14,6 @@ IPV6_OBJS := af_inet6.o ip6_output.o ip6_input.o addrconf.o sit.o \ exthdrs.o sysctl_net_ipv6.o datagram.o proc.o \ ip6_flowlabel.o -MOD_LIST_NAME := IPV6_MODULES M_OBJS := $(O_TARGET) #ifeq ($(CONFIG_IPV6_FIREWALL),y) diff --git a/net/ipv6/netfilter/Makefile b/net/ipv6/netfilter/Makefile index 3dfbefc26..5f89671a2 100644 --- a/net/ipv6/netfilter/Makefile +++ b/net/ipv6/netfilter/Makefile @@ -8,7 +8,6 @@ # Note 2! The CFLAGS definition is now in the main makefile... O_TARGET := netfilter.o -MOD_LIST_NAME := IPV6_MODULES M_OBJS := IP6_NF_CONNTRACK_OBJ:=ip6_conntrack_core.o ip6_conntrack_proto_generic.o ip6_conntrack_proto_tcp.o ip6_conntrack_proto_udp.o ip6_conntrack_proto_icmp.o |