From 5e2829b91497a1bcb234fa1681b9a03a1dd4f86b Mon Sep 17 00:00:00 2001
From: Shaohui Xie <Shaohui.Xie@freescale.com>
Date: Tue, 15 Nov 2011 14:52:22 -0800
Subject: [PATCH] --- yaml --- r: 275949 b: refs/heads/master c:
 86f9a4330580b4ed3d5f7d5b0989ae69518c90f5 h: refs/heads/master i:   275947:
 16bb6f6c277aa7ae5b792f6bfeaee808681a30c2 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/edac/mpc85xx_edac.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 53bfbc34372e..4c0a824b3d99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae5f8c19827493e5a8d48c2c6a8a92201a94f08b
+refs/heads/master: 86f9a4330580b4ed3d5f7d5b0989ae69518c90f5
diff --git a/trunk/drivers/edac/mpc85xx_edac.c b/trunk/drivers/edac/mpc85xx_edac.c
index 8af8e864a9cf..73464a62adf7 100644
--- a/trunk/drivers/edac/mpc85xx_edac.c
+++ b/trunk/drivers/edac/mpc85xx_edac.c
@@ -1128,7 +1128,7 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = {
 	{ .compatible = "fsl,p1020-memory-controller", },
 	{ .compatible = "fsl,p1021-memory-controller", },
 	{ .compatible = "fsl,p2020-memory-controller", },
-	{ .compatible = "fsl,p4080-memory-controller", },
+	{ .compatible = "fsl,qoriq-memory-controller", },
 	{},
 };
 MODULE_DEVICE_TABLE(of, mpc85xx_mc_err_of_match);