diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-05-08 19:35:37 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-05-08 19:35:37 +0200 |
| commit | 7b96c686223a5c902d6a59c7d178f3904f0ab757 (patch) | |
| tree | fe328ed56ad3719de3cfebad72ef74e34f1ed92b /drivers/edac/tile_edac.c | |
| parent | gpio: Move DT support code into drivers/gpio (diff) | |
| parent | Linux 3.4-rc6 (diff) | |
| download | linux-7b96c686223a5c902d6a59c7d178f3904f0ab757.tar.xz linux-7b96c686223a5c902d6a59c7d178f3904f0ab757.zip | |
Merge tag 'v3.4-rc6' into gpio/next
Linux 3.4-rc6
Diffstat (limited to 'drivers/edac/tile_edac.c')
| -rw-r--r-- | drivers/edac/tile_edac.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/edac/tile_edac.c b/drivers/edac/tile_edac.c index 1d5cf06f6c6b..e99d00976189 100644 --- a/drivers/edac/tile_edac.c +++ b/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; |