Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx

1 files changed, 10 insertions, 6 deletions

diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.c b/arch/powerpc/sysdev/bestcomm/bestcomm.c
index 740ad73ce5cc..f589999361e0 100644
--- a/arch/powerpc/sysdev/bestcomm/bestcomm.c
+++ b/arch/powerpc/sysdev/bestcomm/bestcomm.c
@@ -29,11 +29,17 @@
 
 #define DRIVER_NAME "bestcomm-core"
 
+/* MPC5200 device tree match tables */
+static struct of_device_id mpc52xx_sram_ids[] __devinitdata = {
+        { .compatible = "fsl,mpc5200-sram", },
+        { .compatible = "mpc5200-sram", },
+        {}
+};
+
 
 struct bcom_engine *bcom_eng = NULL;
 EXPORT_SYMBOL_GPL(bcom_eng);    /* needed for inline functions */
 
-
 /* ======================================================================== */
 /* Public and private API                                                   */
 /* ======================================================================== */
@@ -373,7 +379,7 @@ mpc52xx_bcom_probe(struct of_device *op, const struct of_device_id *match)
         of_node_get(op->node);
 
         /* Prepare SRAM */
-        ofn_sram = of_find_compatible_node(NULL, "sram", "mpc5200-sram");
+        ofn_sram = of_find_matching_node(NULL, mpc52xx_sram_ids);
         if (!ofn_sram) {
                 printk(KERN_ERR DRIVER_NAME ": "
                         "No SRAM found in device tree\n");
@@ -478,10 +484,8 @@ mpc52xx_bcom_remove(struct of_device *op)
 }
 
 static struct of_device_id mpc52xx_bcom_of_match[] = {
-        {
-                .type           = "dma-controller",
-                .compatible     = "mpc5200-bestcomm",
-        },
+        { .type = "dma-controller", .compatible = "fsl,mpc5200-bestcomm", },
+        { .type = "dma-controller", .compatible = "mpc5200-bestcomm", },
         {},
 };