Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / drivers / net / chelsio / common.h

diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h
index bf3e7b6a7a1898290635cfb134f6bce0016992ef..5d9dd14427c5f30ac27d777c684e0b7c3d5d0d66 100644 (file)
--- a/drivers/net/chelsio/common.h
+++ b/drivers/net/chelsio/common.h
@@ -39,7 +39,6 @@
 #ifndef _CXGB_COMMON_H_
 #define _CXGB_COMMON_H_
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/types.h>