projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
[powerpc.git]
/
net
/
ipv4
/
ipvs
/
ip_vs_proto.c
diff --git
a/net/ipv4/ipvs/ip_vs_proto.c
b/net/ipv4/ipvs/ip_vs_proto.c
index
253c462
..
867d4e9
100644
(file)
--- a/
net/ipv4/ipvs/ip_vs_proto.c
+++ b/
net/ipv4/ipvs/ip_vs_proto.c
@@
-216,9
+216,6
@@
int ip_vs_protocol_init(void)
#ifdef CONFIG_IP_VS_PROTO_UDP
REGISTER_PROTOCOL(&ip_vs_protocol_udp);
#endif
-#ifdef CONFIG_IP_VS_PROTO_ICMP
- REGISTER_PROTOCOL(&ip_vs_protocol_icmp);
-#endif
#ifdef CONFIG_IP_VS_PROTO_AH
REGISTER_PROTOCOL(&ip_vs_protocol_ah);
#endif