Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-3.10.git] / drivers / net / s2io.c

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 74764694c64f7f6f164d534c6205bf9b7946537e..001344c0763ed3eadba132cc37e6e6996145d0ef 100644 (file)
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -44,7 +44,6 @@
  *     aggregated as a single large packet
  ************************************************************************/
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/errno.h>