Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / drivers / net / ibm_emac / ibm_emac_tah.h

diff --git a/drivers/net/ibm_emac/ibm_emac_tah.h b/drivers/net/ibm_emac/ibm_emac_tah.h
index 9299b5dd7eb1d3c0f699bead79abe016deaa9b1a..38153945a2402dde37939983dad98bd7372a5a27 100644 (file)
--- a/drivers/net/ibm_emac/ibm_emac_tah.h
+++ b/drivers/net/ibm_emac/ibm_emac_tah.h
@@ -17,7 +17,6 @@
 #ifndef _IBM_EMAC_TAH_H
 #define _IBM_EMAC_TAH_H
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <asm/ocp.h>