aboutsummaryrefslogtreecommitdiff
path: root/net/netfilter/Kconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-10-08 14:26:36 -0700
committerDavid S. Miller <davem@davemloft.net>2008-10-08 14:26:36 -0700
commitdb2bf2476b2d99d91b4ce87e102dd3a61e92366f (patch)
tree4b41acff6edf29fd7ea23bdadfb95bcf67165590 /net/netfilter/Kconfig
parent02015180e2509afd2e3fe3790a333b30708a116b (diff)
parenta5e8546a8bff5d2047adc279df5753c44ba7b1a1 (diff)
Merge branch 'lvs-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-2.6
Conflicts: net/netfilter/Kconfig
Diffstat (limited to 'net/netfilter/Kconfig')
-rw-r--r--net/netfilter/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index f70b4145ffc..78892cf2b02 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -858,3 +858,5 @@ config NETFILTER_XT_MATCH_U32
endif # NETFILTER_XTABLES
endmenu
+
+source "net/netfilter/ipvs/Kconfig"