From 71b837fe81cad5170d87aea6105d46a8322b6c41 Mon Sep 17 00:00:00 2001 From: Li Yang Date: Wed, 21 Jan 2009 17:46:57 +0800 Subject: [PATCH] --- yaml --- r: 130354 b: refs/heads/master c: 344b62870d99cdee41fa168888b0817599134ab6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/boot/dts/mpc8313erdb.dts | 2 +- trunk/arch/powerpc/platforms/83xx/mpc831x_rdb.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dfee92e7c4d8..2ab0639eea3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e11521506e592aed2eba90166e20796c0695023 +refs/heads/master: 344b62870d99cdee41fa168888b0817599134ab6 diff --git a/trunk/arch/powerpc/boot/dts/mpc8313erdb.dts b/trunk/arch/powerpc/boot/dts/mpc8313erdb.dts index d4df8b6857a4..909a89cab9ac 100644 --- a/trunk/arch/powerpc/boot/dts/mpc8313erdb.dts +++ b/trunk/arch/powerpc/boot/dts/mpc8313erdb.dts @@ -185,7 +185,7 @@ cell-index = <0>; device_type = "network"; model = "eTSEC"; - compatible = "gianfar", "simple-bus"; + compatible = "gianfar"; reg = <0x24000 0x1000>; local-mac-address = [ 00 00 00 00 00 00 ]; interrupts = <37 0x8 36 0x8 35 0x8>; diff --git a/trunk/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/trunk/arch/powerpc/platforms/83xx/mpc831x_rdb.c index 5177bdd2c62a..91a2c80b9d72 100644 --- a/trunk/arch/powerpc/platforms/83xx/mpc831x_rdb.c +++ b/trunk/arch/powerpc/platforms/83xx/mpc831x_rdb.c @@ -71,6 +71,7 @@ static int __init mpc831x_rdb_probe(void) static struct of_device_id __initdata of_bus_ids[] = { { .compatible = "simple-bus" }, + { .compatible = "gianfar" }, {}, };