Merge branch 'master' into for_paulus

[linux-2.6-omap-h63xx.git] / drivers / pcmcia / au1000_db1x00.c

diff --git a/drivers/pcmcia/au1000_db1x00.c b/drivers/pcmcia/au1000_db1x00.c
index fef99f4e30c3746aa8fe8bd2b7c62f0f24df8d11..74e051535d6c0419cad92901dabb9c0737929deb 100644 (file)
--- a/drivers/pcmcia/au1000_db1x00.c
+++ b/drivers/pcmcia/au1000_db1x00.c
@@ -30,7 +30,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>