Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / drivers / mmc / au1xmmc.c

diff --git a/drivers/mmc/au1xmmc.c b/drivers/mmc/au1xmmc.c
index 5dc4bee7abebfb9c8685e61306ae54bdff754060..41069908f4a7ea301660c0e6953b20399cac2e9a 100644 (file)
--- a/drivers/mmc/au1xmmc.c
+++ b/drivers/mmc/au1xmmc.c
@@ -34,7 +34,6 @@
  * So we use the timer to check the status manually.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>