Merge branch 'master' into upstream

[linux-2.6] / net / sched / em_nbyte.c

diff --git a/net/sched/em_nbyte.c b/net/sched/em_nbyte.c
index 42103b2bdc519726f7c77152a61fc0d3e1d7622c..b4b36efce29248e37f1e2a941fa45743d76e4f52 100644 (file)
--- a/net/sched/em_nbyte.c
+++ b/net/sched/em_nbyte.c
@@ -12,7 +12,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/skbuff.h>
 #include <linux/tc_ematch/tc_em_nbyte.h>