diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-06 20:23:44 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-06 20:23:44 -0700 |
| commit | 07176b988ebb20f46a317a60ee1d983fe1630203 (patch) | |
| tree | e54affb1f823742078c68d9506e6035016bc2ea4 /Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt | |
| parent | fa46c7984092f3dbdbb3bcd7338d81a1168d9d2b (diff) | |
| parent | 52764fed5049655926bcecaefd52f0a415ceb105 (diff) | |
| download | linux-07176b988ebb20f46a317a60ee1d983fe1630203.tar.gz linux-07176b988ebb20f46a317a60ee1d983fe1630203.tar.bz2 linux-07176b988ebb20f46a317a60ee1d983fe1630203.zip | |
Merge branch 'next' into for-linus
Merge first round of changes for 3.12 merge window.
Diffstat (limited to 'Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt b/Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt index df70318a617f..49fa14ed155c 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt +++ b/Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt @@ -6,7 +6,7 @@ Required properties: - interrupt-parent: the phandle for the interrupt controller - interrupts: touch controller interrupt - wakeup-gpios: the gpio pin to be used for waking up the controller - as well as uased as irq pin + and also used as irq pin Example: |