summaryrefslogtreecommitdiffstats
path: root/net/ipv6/icmp.c
diff options
context:
space:
mode:
authorDavid S. Miller2012-04-10 20:30:45 +0200
committerDavid S. Miller2012-04-10 20:30:45 +0200
commit06eb4eafbdc0796d741d139a44f1253278da8611 (patch)
treefbdb44317130c371928154c9e6903e699fe2b995 /net/ipv6/icmp.c
parentwiznet: Fix Kconfig dependencies. (diff)
parentMake the "word-at-a-time" helper functions more commonly usable (diff)
downloadkernel-qcow2-linux-06eb4eafbdc0796d741d139a44f1253278da8611.tar.gz
kernel-qcow2-linux-06eb4eafbdc0796d741d139a44f1253278da8611.tar.xz
kernel-qcow2-linux-06eb4eafbdc0796d741d139a44f1253278da8611.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv6/icmp.c')
-rw-r--r--net/ipv6/icmp.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 6dd59f160da4..cc079d8d4681 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -66,7 +66,6 @@
#include <net/inet_common.h>
#include <asm/uaccess.h>
-#include <asm/system.h>
/*
* The ICMP socket(s). This is the most convenient way to flow control