* [patch 1/1] drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
@ 2011-11-15 22:52 akpm
2011-11-24 8:25 ` Kumar Gala
0 siblings, 1 reply; 2+ messages in thread
From: akpm @ 2011-11-15 22:52 UTC (permalink / raw)
To: benh; +Cc: linuxppc-dev, akpm, Shaohui.Xie
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(-)
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);
_
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [patch 1/1] drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
2011-11-15 22:52 [patch 1/1] drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac akpm
@ 2011-11-24 8:25 ` Kumar Gala
0 siblings, 0 replies; 2+ messages in thread
From: Kumar Gala @ 2011-11-24 8:25 UTC (permalink / raw)
To: akpm; +Cc: Shaohui.Xie, linuxppc-dev
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
>=20
> compatible in dts has been changed, so the driver needs to be updated
> accordingly.
>=20
> 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>
> ---
>=20
> drivers/edac/mpc85xx_edac.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
applied to merge
- k=
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-24 8:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-15 22:52 [patch 1/1] drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac akpm
2011-11-24 8:25 ` Kumar Gala
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox