Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / pcmcia / xxs1500_ss.c

diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c
index fa88c360c37a21f1875ba05e3fea58c3194d95ab..3b67a1b6a1972670c5c305c94b64c8677a720fb8 100644 (file)
--- a/drivers/pcmcia/xxs1500_ss.c
+++ b/drivers/pcmcia/xxs1500_ss.c
@@ -17,7 +17,6 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/ss.h>
 #include <pcmcia/cistpl.h>