Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6] / arch / powerpc / boot / dts / stx_gp3_8560.dts

diff --git a/arch/powerpc/boot/dts/stx_gp3_8560.dts b/arch/powerpc/boot/dts/stx_gp3_8560.dts
index 2e9723604148037bec29d0082716e025e907529a..f81fd7fdb29e1ef58f424404904bfddfcd4126ab 100644 (file)
--- a/arch/powerpc/boot/dts/stx_gp3_8560.dts
+++ b/arch/powerpc/boot/dts/stx_gp3_8560.dts
@@ -46,7 +46,7 @@
                reg = <0x00000000 0x10000000>;
        };
 
-       soc8560@fdf00000 {
+       soc@fdf00000 {
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";