Merge branch 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / arm / boot / dts / s5pv210-aquila.dts

diff --git a/arch/arm/boot/dts/s5pv210-aquila.dts b/arch/arm/boot/dts/s5pv210-aquila.dts
index aa64faa72970113a887c22836f9ddb5da5aa6e68..da24ab570b0e8c4b278af7d4844eec2c6e2d777b 100644 (file)
--- a/arch/arm/boot/dts/s5pv210-aquila.dts
+++ b/arch/arm/boot/dts/s5pv210-aquila.dts
@@ -257,7 +257,7 @@
                        linux,code = <KEY_POWER>;
                        label = "power";
                        debounce-interval = <1>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };
 };
@@ -268,7 +268,7 @@
 
 &keypad {
        linux,input-no-autorepeat;
-       linux,input-wakeup;
+       wakeup-source;
        samsung,keypad-num-rows = <3>;
        samsung,keypad-num-columns = <3>;
        pinctrl-names = "default";