Merge branch 'master' into tk71

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

diff --git a/drivers/pcmcia/rsrc_iodyn.c b/drivers/pcmcia/rsrc_iodyn.c
index 8510c35d2952e5a264877632f22954c0de85c77f..523eb691c30b954e3a14d05f4b4e91fc3d27675c 100644 (file)
--- a/drivers/pcmcia/rsrc_iodyn.c
+++ b/drivers/pcmcia/rsrc_iodyn.c
@@ -17,7 +17,6 @@
 #include <linux/kernel.h>
 
 #include <pcmcia/ss.h>
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include "cs_internal.h"