Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[mv-sheeva.git] / drivers / net / ibm_emac / ibm_emac_core.h

diff --git a/drivers/net/ibm_emac/ibm_emac_core.h b/drivers/net/ibm_emac/ibm_emac_core.h
index f61273b2e94fea4031187c98dc1d6b16209d4c49..dabb94afeb98a63a9ef0fd080b4dbf3b8a43e3a3 100644 (file)
--- a/drivers/net/ibm_emac/ibm_emac_core.h
+++ b/drivers/net/ibm_emac/ibm_emac_core.h
@@ -20,7 +20,6 @@
 #ifndef __IBM_EMAC_CORE_H_
 #define __IBM_EMAC_CORE_H_
 
-#include <linux/config.h>
 #include <linux/netdevice.h>
 #include <linux/dma-mapping.h>
 #include <asm/ocp.h>