Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / drivers / net / fec.c

diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index db694c83298961ad4630e2764cf0f7f8833098e2..9b403003174410812b07d7acbf189a676130ac0a 100644 (file)
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -25,7 +25,6 @@
  * Copyright (c) 2004-2006 Macq Electronique SA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>