Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[deliverable/linux.git] / arch / arm / boot / dts / kirkwood-ns2-common.dtsi

diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index e832b63202640aef7b42667dbe59687c6a9cc662..282605f4c92c5163fabd46c155707104a55bd6ac 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -57,7 +57,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               button@1 {
+               power {
                        label = "Power push button";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
@@ -83,7 +83,7 @@
 &mdio {
        status = "okay";
 
-       ethphy0: ethernet-phy {
+       ethphy0: ethernet-phy@X {
                 /* overwrite reg property in board file */
        };
 };