Merge remote-tracking branches 'regulator/topic/discharge', 'regulator/topic/fan53555...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / omap3-overo-common-lcd43.dtsi

diff --git a/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi b/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
index 5f979590571b9ded188a2c2f6a4e0e72808d5e96..7e3fe85a8ad9c47f9a1d6b7f5603f539e6eaccbb 100644 (file)
--- a/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
@@ -172,7 +172,7 @@
                ti,x-plate-ohms = /bits/ 16 <180>;
                ti,pressure-max = /bits/ 16 <255>;
 
-               linux,wakeup;
+               wakeup-source;
        };
 };