Merge branch 'cpuidle' into release

[karo-tx-linux.git] / Documentation / devicetree / bindings / input / ads7846.txt

diff --git a/Documentation/devicetree/bindings/input/ads7846.txt b/Documentation/devicetree/bindings/input/ads7846.txt
index 5f7619c227438784f9f9f71e139b97f295f881e6..df8b1279491d1ffd34e41cc41088f918511400de 100644 (file)
--- a/Documentation/devicetree/bindings/input/ads7846.txt
+++ b/Documentation/devicetree/bindings/input/ads7846.txt
@@ -64,7 +64,7 @@ Optional properties:
                                        pendown-gpio (u32).
        pendown-gpio                    GPIO handle describing the pin the !PENIRQ
                                        line is connected to.
-       linux,wakeup                    use any event on touchscreen as wakeup event.
+       wakeup-source                   use any event on touchscreen as wakeup event.
 
 
 Example for a TSC2046 chip connected to an McSPI controller of an OMAP SoC::