| Message ID | 201111152252.pAFMqMYB032421@wpaz1.hot.corp.google.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Kumar Gala |
| Headers | show |
On Nov 15, 2011, at 4:52 PM, akpm@linux-foundation.org wrote: > From: Shaohui Xie <Shaohui.Xie@freescale.com> > Subject: 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 <Shaohui.Xie@freescale.com> > Cc: Kumar Gala <galak@kernel.crashing.org> > Cc: Grant Likely <grant.likely@secretlab.ca> > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org> > --- > > drivers/edac/mpc85xx_edac.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) applied to merge - k
diff -puN drivers/edac/mpc85xx_edac.c~drivers-edac-mpc85xx_edacc-fix-memory-controller-compatible-for-edac drivers/edac/mpc85xx_edac.c --- a/drivers/edac/mpc85xx_edac.c~drivers-edac-mpc85xx_edacc-fix-memory-controller-compatible-for-edac +++ a/drivers/edac/mpc85xx_edac.c @@ -1128,7 +1128,7 @@ static struct of_device_id mpc85xx_mc_er { .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);