Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlie...

[linux-2.6] / arch / powerpc / sysdev / fsl_soc.c

diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 8a123c71449fffd9315b085158f0e1a8d6f5795a..c0ddc80d8160452238bbf0de29cf23c24340785b 100644 (file)
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -907,7 +907,7 @@ static int __init fs_enet_of_init(void)
                struct fs_platform_info fs_enet_data;
                const unsigned int *id;
                const unsigned int *phy_addr;
-               void *mac_addr;
+               const void *mac_addr;
                const phandle *ph;
                const char *model;
 
@@ -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";