Merge branch 'for-2.6.23' into merge

1 files changed, 13 insertions, 0 deletions

diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index cad175724359..c0ddc80d8160 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -1028,6 +1028,19 @@ err:
 
 arch_initcall(fs_enet_of_init);
 
+static int __init fsl_pcmcia_of_init(void)
+{
+        struct device_node *np = NULL;
+        /*
+         * Register all the devices which type is "pcmcia"
+         */
+        while ((np = of_find_compatible_node(np,
+                        "pcmcia", "fsl,pq-pcmcia")) != NULL)
+                            of_platform_device_create(np, "m8xx-pcmcia", NULL);
+        return 0;
+}
+
+arch_initcall(fsl_pcmcia_of_init);
 
 static const char *smc_regs = "regs";
 static const char *smc_pram = "pram";