summaryrefslogtreecommitdiff
path: root/net/ipv4/arp.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-02-17 20:11:43 (GMT)
committerJeff Garzik <jeff@garzik.org>2007-02-17 20:11:43 (GMT)
commitf630fe2817601314b2eb7ca5ddc23c7834646731 (patch)
tree3bfb4939b7bbc3859575ca8b58fa3f929b015941 /net/ipv4/arp.c
parent48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff)
parent8a03d9a498eaf02c8a118752050a5154852c13bf (diff)
downloadlinux-fsl-qoriq-f630fe2817601314b2eb7ca5ddc23c7834646731.tar.xz
Merge branch 'master' into upstream
Diffstat (limited to 'net/ipv4/arp.c')
-rw-r--r--net/ipv4/arp.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 0ffd2d2..1a3488a 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -78,7 +78,6 @@
#include <linux/types.h>
#include <linux/string.h>
#include <linux/kernel.h>
-#include <linux/sched.h>
#include <linux/capability.h>
#include <linux/socket.h>
#include <linux/sockios.h>