From d07cdd3b2f9d3ef8331c44593bdce4cc9574d580 Mon Sep 17 00:00:00 2001
From: Timur Tabi <timur@freescale.com>
Date: Mon, 3 May 2010 16:54:15 -0500
Subject: [PATCH] --- yaml --- r: 196651 b: refs/heads/master c:
 4c5ddd52695f7bac6362ad13fd3dc878212d1368 h: refs/heads/master i:   196649:
 4222ca6ceee9037a4de5dd4e138b42a669870e34   196647:
 994ff16618dbd9678322cd0c4604de767fab1ab8 v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 533d379c402d..339785dd26fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6971df4f5b0e5b6955c03e8d51bad5d50463f98f
+refs/heads/master: 4c5ddd52695f7bac6362ad13fd3dc878212d1368
diff --git a/trunk/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/trunk/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index 5abe137f6309..018cc67be426 100644
--- a/trunk/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/trunk/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -83,7 +83,8 @@ static struct of_device_id __initdata mpc8610_ids[] = {
 	{ .compatible = "fsl,mpc8610-immr", },
 	{ .compatible = "fsl,mpc8610-guts", },
 	{ .compatible = "simple-bus", },
-	{ .compatible = "gianfar", },
+	/* So that the DMA channel nodes can be probed individually: */
+	{ .compatible = "fsl,eloplus-dma", },
 	{}
 };