Merge branch 'master' into upstream

[pandora-kernel.git] / include / net / red.h

diff --git a/include/net/red.h b/include/net/red.h
index 2ed4358..5ccdbb3 100644 (file)
--- a/include/net/red.h
+++ b/include/net/red.h
@@ -1,7 +1,6 @@
 #ifndef __NET_SCHED_RED_H
 #define __NET_SCHED_RED_H
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <net/pkt_sched.h>
 #include <net/inet_ecn.h>