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

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

diff --git a/arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts b/arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts
index fa02a9aff05e1cdf447637850ba45c66ff370060..f16a73e49a88b444932d3aaeda75e61e5c3ca048 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts
+++ b/arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts
@@ -36,13 +36,13 @@
        gpio_keys {
                compatible = "gpio-keys";
 
-               button@1{
+               reset {
                        label = "Reset";
                        linux,code = <KEY_POWER>;
                        gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
                };
 
-               button@2{
+               button {
                        label = "Power";
                        linux,code = <KEY_SLEEP>;
                        gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;