[ARM] Update sa1100 PCMCIA support

We removed asm/mach-types.h from asm/hardware.h.  This means we must
now include asm/mach-types.h where its used.

We also fix h3600 pcmcia initialisation/cleanup.

drivers/pcmcia/sa1100_assabet.c

@@ -11,6 +11,7 @@
 #include <linux/init.h>
 
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/arch/assabet.h>
 

drivers/pcmcia/sa1100_cerf.c

@@ -11,6 +11,7 @@
 #include <linux/init.h>
 
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 #include <asm/irq.h>
 #include "sa1100_generic.h"
 

drivers/pcmcia/sa1100_flexanet.c

@@ -11,6 +11,7 @@
 #include <linux/init.h>
 
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 #include <asm/irq.h>
 #include "sa1100_generic.h"
 

drivers/pcmcia/sa1100_freebird.c

@@ -9,6 +9,7 @@
 #include <linux/init.h>
 
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 #include <asm/irq.h>
 #include "sa1100_generic.h"
 

drivers/pcmcia/sa1100_generic.c

@@ -719,7 +719,7 @@ sa1100_pcmcia_set_mem_map(unsigned int sock, struct pccard_mem_map *map)
 	(map->flags&MAP_ATTRIB)?"ATTRIB ":"",
 	(map->flags&MAP_USE_WAIT)?"USE_WAIT ":"");
 
-  if (map->map >= MAX_WIN){
+  if (map->map >= MAX_WIN) {
     printk(KERN_ERR "%s(): map (%d) out of range\n", __FUNCTION__,
 	   map->map);
     return -1;
@@ -1148,6 +1148,9 @@ static int __init sa1100_pcmcia_init(void)
 #ifdef CONFIG_SA1100_GRAPHICSCLIENT
 	pcmcia_gcplus_init();
 #endif
+#ifdef CONFIG_SA1100_H3600
+	pcmcia_h3600_init();
+#endif
 #ifdef CONFIG_SA1100_PANGOLIN
 	pcmcia_pangolin_init();
 #endif
@@ -1192,6 +1195,9 @@ static void __exit sa1100_pcmcia_exit(void)
 #ifdef CONFIG_SA1100_GRAPHICSCLIENT
 	pcmcia_gcplus_exit();
 #endif
+#ifdef CONFIG_SA1100_H3600
+	pcmcia_h3600_exit();
+#endif
 #ifdef CONFIG_SA1100_PANGOLIN
 	pcmcia_pangolin_exit();
 #endif

drivers/pcmcia/sa1100_graphicsclient.c

@@ -17,6 +17,7 @@
 #include <linux/init.h>
 
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 #include <asm/irq.h>
 #include "sa1100_generic.h"
 

drivers/pcmcia/sa1100_h3600.c

@@ -10,6 +10,9 @@
 
 #include <asm/hardware.h>
 #include <asm/irq.h>
+#include <asm/mach-types.h>
+#include <asm/arch/h3600.h>
+
 #include "sa1100_generic.h"
 
 static struct irqs {
@@ -195,3 +198,17 @@ struct pcmcia_low_level h3600_pcmcia_ops = {
 	.socket_suspend		= h3600_pcmcia_socket_suspend,
 };
 
+int __init pcmcia_h3600_init(void)
+{
+	int ret = -ENODEV;
+
+	if (machine_is_h3600())
+		ret = sa1100_register_pcmcia(&h3600_pcmcia_ops);
+
+	return ret;
+}
+
+void __exit pcmcia_h3600_exit(void)
+{
+	sa1100_unregister_pcmcia(&h3600_pcmcia_ops);
+}

drivers/pcmcia/sa1100_pangolin.c

@@ -10,6 +10,7 @@
 #include <linux/init.h>
 
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 #include <asm/irq.h>
 #include "sa1100_generic.h"
 

drivers/pcmcia/sa1100_shannon.c

@@ -9,6 +9,7 @@
 #include <linux/init.h>
 
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 #include <asm/arch/shannon.h>
 #include <asm/irq.h>
 #include "sa1100_generic.h"

drivers/pcmcia/sa1100_simpad.c

@@ -9,6 +9,7 @@
 #include <linux/init.h>
 
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 #include <asm/irq.h>
 #include "sa1100_generic.h"
  

drivers/pcmcia/sa1100_stork.c

@@ -25,6 +25,7 @@
 #include <linux/i2c.h>
 
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 #include <asm/irq.h>
 #include "sa1100_generic.h"
 

drivers/pcmcia/sa1100_trizeps.c

@@ -14,6 +14,7 @@
 #include <linux/init.h>
 
 #include <asm/hardware.h>   // included trizeps.h
+#include <asm/mach-types.h>
 #include <asm/system.h>
 #include <asm/irq.h>
 #include "sa1100_generic.h"

drivers/pcmcia/sa1100_yopy.c

@@ -9,6 +9,7 @@
 #include <linux/init.h>
 
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 #include <asm/irq.h>
 #include "sa1100_generic.h"