Merge branch 'tj-upstream-fixes' of git://htj.dyndns.org/libata-tj into tmp

[linux-2.6-omap-h63xx.git] / net / dccp / timer.c

diff --git a/net/dccp/timer.c b/net/dccp/timer.c
index 5244415e5f1877762d98ba5763e0174f37ee4e7e..8447742f5615c6b615ee40ae086f5d4a1e6052d6 100644 (file)
--- a/net/dccp/timer.c
+++ b/net/dccp/timer.c
@@ -10,7 +10,6 @@
  *     2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/dccp.h>
 #include <linux/skbuff.h>