Merge with Linu 2.4.0-test6-pre6.

13 files changed, 2 insertions, 14 deletions

diff --git a/net/Makefile b/net/Makefile
index 0ecbb1a9d..29f66733f 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -12,8 +12,6 @@ ALL_SUB_DIRS := 802 ax25 bridge core ethernet ipv4 ipv6 ipx unix appletalk \
 		netrom rose lapb x25 wanrouter netlink sched packet sunrpc \
 		econet irda decnet atm khttpd ipv4/netfilter ipv6/netfilter
 SUB_DIRS     := core ethernet
-MOD_LIST_NAME := NET_MISC_MODULES
-
 
 ifeq ($(CONFIG_NET),y)
 SUB_DIRS += 802 sched
diff --git a/net/econet/Makefile b/net/econet/Makefile
index 8da31b692..38d0d4b58 100644
--- a/net/econet/Makefile
+++ b/net/econet/Makefile
@@ -8,7 +8,6 @@
 # Note 2! The CFLAGS definition is now in the main makefile...
 
 O_TARGET := econet.o
-MOD_LIST_NAME := NET_MISC_MODULES
 
 O_OBJS := af_econet.o sysctl_net_ec.o
 M_OBJS := $(O_TARGET)
diff --git a/net/ipv4/Makefile b/net/ipv4/Makefile
index a0d501ec5..b162de66c 100644
--- a/net/ipv4/Makefile
+++ b/net/ipv4/Makefile
@@ -16,7 +16,6 @@ IPV4_OBJS := utils.o route.o inetpeer.o proc.o protocol.o \
 	     sysctl_net_ipv4.o fib_frontend.o fib_semantics.o fib_hash.o
 IPV4X_OBJS :=
 
-MOD_LIST_NAME := IPV4_MODULES
 M_OBJS :=
 
 ifeq ($(CONFIG_IP_MULTIPLE_TABLES),y)
diff --git a/net/ipv4/netfilter/Makefile b/net/ipv4/netfilter/Makefile
index bc892e7db..cbf6e19eb 100644
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -8,7 +8,6 @@
 # Note 2! The CFLAGS definition is now in the main makefile...
 
 O_TARGET := netfilter.o
-MOD_LIST_NAME := IPV4_MODULES
 M_OBJS :=
 
 IP_NF_CONNTRACK_OBJ:=ip_conntrack_core.o ip_conntrack_proto_generic.o ip_conntrack_proto_tcp.o ip_conntrack_proto_udp.o ip_conntrack_proto_icmp.o
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index 7a24b21dd..cfc8ca6da 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -1753,6 +1753,8 @@ EXPORT_SYMBOL(ipt_unregister_table);
 EXPORT_SYMBOL(ipt_register_match);
 EXPORT_SYMBOL(ipt_unregister_match);
 EXPORT_SYMBOL(ipt_do_table);
+EXPORT_SYMBOL(ipt_register_target);
+EXPORT_SYMBOL(ipt_unregister_target);
 
 module_init(init);
 module_exit(fini);
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
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)
diff --git a/net/khttpd/Makefile b/net/khttpd/Makefile
index bd7d5499b..b594de142 100644
--- a/net/khttpd/Makefile
+++ b/net/khttpd/Makefile
@@ -8,7 +8,6 @@
 # Note 2! The CFLAGS definition is now in the main makefile...
 
 O_TARGET := khttpd.o
-MOD_LIST_NAME := NET_MODULES
 
 M_OBJS := $(O_TARGET)
 O_OBJS := 	main.o accept.o datasending.o logging.o misc.o rfc.o rfc_time.o security.o \
diff --git a/net/netlink/Makefile b/net/netlink/Makefile
index db134a98d..da89d0af0 100644
--- a/net/netlink/Makefile
+++ b/net/netlink/Makefile
@@ -8,7 +8,6 @@
 # Note 2! The CFLAGS definition is now in the main makefile...
 
 O_TARGET := netlink.o
-MOD_LIST_NAME := NET_MISC_MODULES
 
 O_OBJS  := 
 OX_OBJS := af_netlink.o
diff --git a/net/packet/Makefile b/net/packet/Makefile
index cce16721d..95a98ed95 100644
--- a/net/packet/Makefile
+++ b/net/packet/Makefile
@@ -8,7 +8,6 @@
 # Note 2! The CFLAGS definition is now in the main makefile...
 
 O_TARGET := packet.o
-MOD_LIST_NAME := NET_MISC_MODULES
 
 O_OBJS :=
 M_OBJS :=