From a990400b0f5aab56897547ce6a57f696362a7187 Mon Sep 17 00:00:00 2001
From: Chris Metcalf <cmetcalf@tilera.com>
Date: Fri, 30 Mar 2012 18:58:37 -0400
Subject: [PATCH] --- yaml --- r: 298859 b: refs/heads/master c:
 e2e110d7596656e2badd21c48713bd01e1b40f44 h: refs/heads/master i:   298857:
 6c032a32c7e47fe3333205df282d4856372dd0eb   298855:
 4bc37942fcedb43b61df39ced0ab30acea2d711e v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/edac/tile_edac.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1d499035f452..f03cbd3c833d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1d5c0195075abaa45cd04ca397dbeaa0d18c490
+refs/heads/master: e2e110d7596656e2badd21c48713bd01e1b40f44
diff --git a/trunk/drivers/edac/tile_edac.c b/trunk/drivers/edac/tile_edac.c
index 1d5cf06f6c6b..e99d00976189 100644
--- a/trunk/drivers/edac/tile_edac.c
+++ b/trunk/drivers/edac/tile_edac.c
@@ -145,7 +145,11 @@ static int __devinit tile_edac_mc_probe(struct platform_device *pdev)
 	mci->edac_ctl_cap = EDAC_FLAG_SECDED;
 
 	mci->mod_name = DRV_NAME;
+#ifdef __tilegx__
+	mci->ctl_name = "TILEGx_Memory_Controller";
+#else
 	mci->ctl_name = "TILEPro_Memory_Controller";
+#endif
 	mci->dev_name = dev_name(&pdev->dev);
 	mci->edac_check = tile_edac_check;