diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-02 17:39:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-02 17:39:49 -0700 |
| commit | aa447acb9291518506a1aec644db47fa6c6e36eb (patch) | |
| tree | 4b7b3e5c72641f6695ea935ddd9f8250a2e4b937 /net/ipv4/ipvs/Makefile | |
| parent | 317604633eface11cb7452298fa44a34624633dc (diff) | |
| parent | 5ba0eac6e0b7e2889649a1105d97c600595e2bb1 (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/ipvs/Makefile')
| -rw-r--r-- | net/ipv4/ipvs/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipvs/Makefile b/net/ipv4/ipvs/Makefile index a788461a40c..30e85de9fff 100644 --- a/net/ipv4/ipvs/Makefile +++ b/net/ipv4/ipvs/Makefile @@ -11,7 +11,7 @@ ip_vs_proto-objs-$(CONFIG_IP_VS_PROTO_AH) += ip_vs_proto_ah.o ip_vs-objs := ip_vs_conn.o ip_vs_core.o ip_vs_ctl.o ip_vs_sched.o \ ip_vs_xmit.o ip_vs_app.o ip_vs_sync.o \ - ip_vs_est.o ip_vs_proto.o ip_vs_proto_icmp.o \ + ip_vs_est.o ip_vs_proto.o \ $(ip_vs_proto-objs-y) |