[NETFILTER]: link 'netfilter' before ipv4

Staticaly linked nf_conntrack_ipv4 requires nf_conntrack. but currently
nf_conntrack is linked after it. This changes the order of ipv4 and netfilter
to fix this.

Signed-off-by: Krzysztof Oledzki <olenf@ans.pl>
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/Makefile b/net/Makefile
index 4aa2f46d2a561f5ccc514a6f19312487cabba807..f5141b9d4f38ff94e7a696438bbaa2e9de9f3214 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -15,8 +15,8 @@ obj-$(CONFIG_NET)             += $(tmp-y)
 # LLC has to be linked before the files in net/802/
 obj-$(CONFIG_LLC)              += llc/
 obj-$(CONFIG_NET)              += ethernet/ 802/ sched/ netlink/
-obj-$(CONFIG_INET)             += ipv4/
 obj-$(CONFIG_NETFILTER)                += netfilter/
+obj-$(CONFIG_INET)             += ipv4/
 obj-$(CONFIG_XFRM)             += xfrm/
 obj-$(CONFIG_UNIX)             += unix/
 ifneq ($(CONFIG_IPV6),)