diff options
author | Krzysztof Oledzki <olenf@ans.pl> | 2005-11-14 18:25:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-11-14 18:25:59 -0500 |
commit | 47d4305bf2275f82a51fa025257c2c1996356d6b (patch) | |
tree | a2535f404655905a6e0b86b4a54b54ca9a93764c /net | |
parent | 37d2e7a20d745035b600f1a6be56cbb9c7259419 (diff) |
[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>
Diffstat (limited to 'net')
-rw-r--r-- | net/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/Makefile b/net/Makefile index 4aa2f46d2a56..f5141b9d4f38 100644 --- a/net/Makefile +++ b/net/Makefile | |||
@@ -15,8 +15,8 @@ obj-$(CONFIG_NET) += $(tmp-y) | |||
15 | # LLC has to be linked before the files in net/802/ | 15 | # LLC has to be linked before the files in net/802/ |
16 | obj-$(CONFIG_LLC) += llc/ | 16 | obj-$(CONFIG_LLC) += llc/ |
17 | obj-$(CONFIG_NET) += ethernet/ 802/ sched/ netlink/ | 17 | obj-$(CONFIG_NET) += ethernet/ 802/ sched/ netlink/ |
18 | obj-$(CONFIG_INET) += ipv4/ | ||
19 | obj-$(CONFIG_NETFILTER) += netfilter/ | 18 | obj-$(CONFIG_NETFILTER) += netfilter/ |
19 | obj-$(CONFIG_INET) += ipv4/ | ||
20 | obj-$(CONFIG_XFRM) += xfrm/ | 20 | obj-$(CONFIG_XFRM) += xfrm/ |
21 | obj-$(CONFIG_UNIX) += unix/ | 21 | obj-$(CONFIG_UNIX) += unix/ |
22 | ifneq ($(CONFIG_IPV6),) | 22 | ifneq ($(CONFIG_IPV6),) |