diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-08 14:26:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-08 14:26:36 -0700 |
| commit | db2bf2476b2d99d91b4ce87e102dd3a61e92366f (patch) | |
| tree | 4b41acff6edf29fd7ea23bdadfb95bcf67165590 /net/netfilter/Makefile | |
| parent | 02015180e2509afd2e3fe3790a333b30708a116b (diff) | |
| parent | a5e8546a8bff5d2047adc279df5753c44ba7b1a1 (diff) | |
| download | talos-obmc-linux-db2bf2476b2d99d91b4ce87e102dd3a61e92366f.tar.gz talos-obmc-linux-db2bf2476b2d99d91b4ce87e102dd3a61e92366f.zip | |
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/Makefile')
| -rw-r--r-- | net/netfilter/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile index 8ce67665882d..da3d909e053f 100644 --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile @@ -89,3 +89,6 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o + +# IPVS +obj-$(CONFIG_IP_VS) += ipvs/ |
