aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/cls_api.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-02-17 15:11:43 -0500
committerJeff Garzik <jeff@garzik.org>2007-02-17 15:11:43 -0500
commitf630fe2817601314b2eb7ca5ddc23c7834646731 (patch)
tree3bfb4939b7bbc3859575ca8b58fa3f929b015941 /net/sched/cls_api.c
parentMerge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream (diff)
parentMerge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 (diff)
downloadlinux-dev-f630fe2817601314b2eb7ca5ddc23c7834646731.tar.xz
linux-dev-f630fe2817601314b2eb7ca5ddc23c7834646731.zip
Merge branch 'master' into upstream
Diffstat (limited to 'net/sched/cls_api.c')
-rw-r--r--net/sched/cls_api.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index f41f4ee0587a..5c6ffdb77d2d 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -20,7 +20,6 @@
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
-#include <linux/sched.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/socket.h>