From 960e8cd71953ae9f56bbd67c328d9ef9d51864a2 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Mon, 31 Mar 2008 11:13:21 -0500
Subject: [PATCH] --- yaml --- r: 88117 b: refs/heads/master c:
 049c9d45531d9825bf737891163a794fca1421c5 h: refs/heads/master i:   88115:
 a0cf563d8e01d0843cfd1e6b25daa3fe4b670dca v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/dma/fsldma.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a40ee5d1c65c..f794a618de9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96ce1b6dc5824cc6027c954b9a2e4717c70e01b5
+refs/heads/master: 049c9d45531d9825bf737891163a794fca1421c5
diff --git a/trunk/drivers/dma/fsldma.c b/trunk/drivers/dma/fsldma.c
index 72692309398a..df163687c91a 100644
--- a/trunk/drivers/dma/fsldma.c
+++ b/trunk/drivers/dma/fsldma.c
@@ -1021,11 +1021,11 @@ const u32 mpc8349_dma_ip_feature = FSL_DMA_IP_83XX | FSL_DMA_LITTLE_ENDIAN;
 
 static struct of_device_id of_fsl_dma_chan_ids[] = {
 	{
-		.compatible = "fsl,mpc8540-dma-channel",
+		.compatible = "fsl,eloplus-dma-channel",
 		.data = (void *)&mpc8540_dma_ip_feature,
 	},
 	{
-		.compatible = "fsl,mpc8349-dma-channel",
+		.compatible = "fsl,elo-dma-channel",
 		.data = (void *)&mpc8349_dma_ip_feature,
 	},
 	{}
@@ -1107,8 +1107,8 @@ static int __devinit of_fsl_dma_probe(struct of_device *dev,
 }
 
 static struct of_device_id of_fsl_dma_ids[] = {
-	{ .compatible = "fsl,mpc8540-dma", },
-	{ .compatible = "fsl,mpc8349-dma", },
+	{ .compatible = "fsl,eloplus-dma", },
+	{ .compatible = "fsl,elo-dma", },
 	{}
 };