From: Shaohui Xie Date: Wed, 28 Sep 2011 00:49:44 +0000 (+1000) Subject: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac X-Git-Tag: next-20111004~1^2~233 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1a46bf8872a304462fc84cfcb45ae4bb4c255652;p=karo-tx-linux.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: Kumar Gala Cc: Grant Likely Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton <> --- 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);