Merge branch 'from-linus' into upstream

[linux-2.6] / drivers / net / eexpress.c

diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index a74b20715755d4ff5dd63f98aa57e53248c41b1e..33291bcf6d4cc917289184c73e77c4a15f6667ca 100644 (file)
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -97,7 +97,6 @@
 #define LOCKUP16 0
 #endif
   
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>