diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-07-01 10:28:42 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-07-01 10:28:46 +0200 |
commit | 10e6962765f8213941eaa1cbb9de425ff0689e2e (patch) | |
tree | c277e4ac5b2b7156152454578c39e90da5127dd8 /net/ipv4/ping.c | |
parent | af07ce3e77d3b24ab1d71fcc5833d41800f23b2b (diff) | |
parent | b0af8dfdd67699e25083478c63eedef2e72ebd85 (diff) |
Merge commit 'v3.0-rc5' into perf/core
Merge reason: Pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/ipv4/ping.c')
-rw-r--r-- | net/ipv4/ping.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 9aaa67165f4..39b403f854c 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -41,7 +41,6 @@ #include <linux/proc_fs.h> #include <net/sock.h> #include <net/ping.h> -#include <net/icmp.h> #include <net/udp.h> #include <net/route.h> #include <net/inet_common.h> |