From: Shaohui Xie Date: Tue, 15 Nov 2011 22:52:22 +0000 (-0800) Subject: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac X-Git-Tag: MMI-PSA29.97-13-9~17965^2~4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=86f9a4330580b4ed3d5f7d5b0989ae69518c90f5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac compatible in dts has been changed, so the driver needs to be updated accordingly. Signed-off-by: Shaohui Xie Cc: Grant Likely Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Kumar Gala --- diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index 8af8e864a9cf..73464a62adf7 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/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);