diff options
| author | Krzysztof Oledzki <olenf@ans.pl> | 2005-11-15 00:25:59 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-11-15 00:25:59 +0100 |
| commit | 47d4305bf2275f82a51fa025257c2c1996356d6b (patch) | |
| tree | a2535f404655905a6e0b86b4a54b54ca9a93764c /net/Makefile | |
| parent | [NETFILTER] nfnetlink: unconditionally require CAP_NET_ADMIN (diff) | |
| download | linux-47d4305bf2275f82a51fa025257c2c1996356d6b.tar.xz linux-47d4305bf2275f82a51fa025257c2c1996356d6b.zip | |
[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/Makefile')
| -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) # 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),) |