From 4b4a447f21054ac7235a16fb38b36a1d882d7403 Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Wed, 17 Feb 2010 07:33:22 -0700 Subject: [PATCH] --- yaml --- r: 181943 b: refs/heads/master c: d24720a45ad2928f687c6371482cdfba19b74fc5 h: refs/heads/master i: 181941: 439e28c0fe47dc889ba4c210327de84182c6277f 181939: 4c8c92ae5a9c498ab1da91422cd7289046b2507d 181935: fab13b042f70dc87ff7802af988f1ef16bf2c07d v: v3 --- [refs] | 2 +- trunk/arch/powerpc/boot/dts/mpc5121ads.dts | 2 +- trunk/drivers/video/fsl-diu-fb.c | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1f7d7f726b1b..ce3a89273245 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85cd7467f3a66800c20815d3fca45d33038b9279 +refs/heads/master: d24720a45ad2928f687c6371482cdfba19b74fc5 diff --git a/trunk/arch/powerpc/boot/dts/mpc5121ads.dts b/trunk/arch/powerpc/boot/dts/mpc5121ads.dts index d2b2db7cb4a2..c9ef6bbe26cf 100644 --- a/trunk/arch/powerpc/boot/dts/mpc5121ads.dts +++ b/trunk/arch/powerpc/boot/dts/mpc5121ads.dts @@ -255,7 +255,7 @@ }; display@2100 { - compatible = "fsl,mpc5121-diu", "fsl,diu"; + compatible = "fsl,mpc5121-diu"; reg = <0x2100 0x100>; interrupts = <64 0x8>; interrupt-parent = < &ipic >; diff --git a/trunk/drivers/video/fsl-diu-fb.c b/trunk/drivers/video/fsl-diu-fb.c index 72d68b3dc478..4637bcbe03a4 100644 --- a/trunk/drivers/video/fsl-diu-fb.c +++ b/trunk/drivers/video/fsl-diu-fb.c @@ -1633,6 +1633,11 @@ static int __init fsl_diu_setup(char *options) #endif static struct of_device_id fsl_diu_match[] = { +#ifdef CONFIG_PPC_MPC512x + { + .compatible = "fsl,mpc5121-diu", + }, +#endif { .compatible = "fsl,diu", },