diff --git a/[refs] b/[refs] index 723098f3cdae..4cd4a6e7a949 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ded563cf458e7803536f9d7b6bc5d808a6e37f21 +refs/heads/master: 38d56f1677130004497835a776feb84f068ce22a diff --git a/trunk/arch/powerpc/boot/dts/yosemite.dts b/trunk/arch/powerpc/boot/dts/yosemite.dts index e39422aa0d85..1fa3cb4c4ebb 100644 --- a/trunk/arch/powerpc/boot/dts/yosemite.dts +++ b/trunk/arch/powerpc/boot/dts/yosemite.dts @@ -15,7 +15,7 @@ #address-cells = <2>; #size-cells = <1>; model = "amcc,yosemite"; - compatible = "amcc,yosemite","amcc,bamboo"; + compatible = "amcc,yosemite"; dcr-parent = <&{/cpus/cpu@0}>; aliases { diff --git a/trunk/arch/powerpc/platforms/44x/ppc44x_simple.c b/trunk/arch/powerpc/platforms/44x/ppc44x_simple.c index 1c064b242cf0..57e71203d0f8 100644 --- a/trunk/arch/powerpc/platforms/44x/ppc44x_simple.c +++ b/trunk/arch/powerpc/platforms/44x/ppc44x_simple.c @@ -57,7 +57,8 @@ static char *board[] __initdata = { "amcc,katmai", "amcc,rainier", "amcc,sequoia", - "amcc,taishan" + "amcc,taishan", + "amcc,yosemite" }; static int __init ppc44x_probe(void)