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

[deliverable/linux.git] / arch / arm / boot / dts / kirkwood-openblocks_a6.dts

diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index fb9dc227255d91a2a4bdb58a7adfac3072a80521..0db0e3edc88fc13f50b243af4012ed55aceb9b8f 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -117,7 +117,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               button@1 {
+               power {
                        label = "Init Button";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;