commit fa87672ab30ce6564393778b8cbc67fc32712a30
author Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> Mon Oct 18 22:41:29 2010 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Tue Dec 21 14:53:45 2010 +0000
tree 50551c8763a12f37ef483055aa0e53b4f894776a
parent 17b38ebb6a32250a220d6af77293f7e3f9c62a6e

ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support.

This patch adds nanoEngine PCMCIA support, with support for two sockets.

In order to have a fully functional pcmcia subsystem in a BSE
nanoEngine board you should carefully read this:

http://cambuca.ldhs.cetuc.puc-rio.br/nanoengine/

Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

drivers/pcmcia/sa1100_generic.c

diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
index 945857f..ff8a027 100644
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -53,6 +53,9 @@
 #if defined(CONFIG_SA1100_H3100) || defined(CONFIG_SA1100_H3600)
 	pcmcia_h3600_init,
 #endif
+#ifdef CONFIG_SA1100_NANOENGINE
+	pcmcia_nanoengine_init,
+#endif
 #ifdef CONFIG_SA1100_SHANNON
 	pcmcia_shannon_init,
 #endif