[ARM PATCH] 1096/4: trizeps PCMCIA support

Patch from Guennadi Liakhovetski

A minor update, trizeps.h has to be included explicitely now, since
platform-specific headers are commented out in hardware.h

drivers/pcmcia/sa1100_trizeps.c

@@ -13,7 +13,8 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 
-#include <asm/hardware.h>   // included trizeps.h
+#include <asm/hardware.h>
+#include <asm/arch/trizeps.h>
 #include <asm/mach-types.h>
 #include <asm/system.h>
 #include <asm/irq.h>
@@ -54,7 +55,7 @@ static int trizeps_pcmcia_init(struct pcmcia_init *init)
 	return NUMBER_OF_TRIZEPS_PCMCIA_SLOTS;
 
  irq_err:
-	printk( KERN_ERR __FUNCTION__ ": PCMCIA Request for IRQ %u failed\n", TRIZEPS_IRQ_PCMCIA_CD0 );
+	printk( KERN_ERR "%s(): PCMCIA Request for IRQ %u failed\n", __FUNCTION__, TRIZEPS_IRQ_PCMCIA_CD0 );
 	return -1;
 }