Merge tag 'powerpc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[karo-tx-linux.git] / arch / arm / boot / dts / ste-nomadik-s8815.dts

diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts
index 35282c0105c6a1de01b80371b77e98aa82cfadf1..789329030658a20860b3e4fb642bfabca0578ef1 100644 (file)
--- a/arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts
@@ -163,7 +163,7 @@
                        label = "user_button";
                        gpios = <&gpio0 3 0x1>;
                        linux,code = <1>; /* KEY_ESC */
-                       gpio-key,wakeup;
+                       wakeup-source;
                        pinctrl-names = "default";
                        pinctrl-0 = <&user_button_default_mode>;
                };