Merge branch 'from-linus' into upstream

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

diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 60304f7e7e5b9703a6973a733cb452ff44517b18..a8c245a822611d39bbfc92ef60200d28e1bf3a7c 100644 (file)
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -27,7 +27,6 @@
  *             as published by the Free Software Foundation; either version
  *             2 of the License, or (at your option) any later version.
  */
-#include <linux/config.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/trdevice.h>