Merge branch 'slab/common-for-cgroups' into slab/for-linus

[~andy/linux] / drivers / mtd / maps / pcmciamtd.c

diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 7d5cf369f0ad747c05c81409441849a972421992..a3cfad392ed653c1543a5318ddfc40f007b72233 100644 (file)
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -14,7 +14,6 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <asm/io.h>
-#include <asm/system.h>
 
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>