#
# Patch managed by http://www.holgerschurig.de/patcher.html
#

--- linux-2.6.10-rc2/drivers/pcmcia/pxa2xx_base.c~pxa_pcmcia_core
+++ linux-2.6.10-rc2/drivers/pcmcia/pxa2xx_base.c
@@ -217,7 +217,13 @@
 {
 	int ret = 0;
 	if (level == RESUME_RESTORE_STATE)
+	{
+		struct pcmcia_low_level *ops = dev->platform_data;
+		int nr = ops ? ops->nr : 0;
+
+		MECR = nr > 1 ? MECR_CIT | MECR_NOS : (nr > 0 ? MECR_CIT : 0);
 		ret = pcmcia_socket_dev_resume(dev);
+	}
 	return ret;
 }