summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-28 18:04:50 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-28 18:04:50 -0700
commite704966c45e48d0220d1ee5e463034ae493a95b2 (patch)
treef97c5d85a6889dbbc3ec70420d37e109a40f9b26 /Documentation
parent2f19e7a7e63a04f4bbaf327d9d0e69ac800b2b8f (diff)
parent4fef1250eafddc5182cd5c3c354a6971bcf7520d (diff)
downloadlinux-stable-e704966c45e48d0220d1ee5e463034ae493a95b2.tar.gz
linux-stable-e704966c45e48d0220d1ee5e463034ae493a95b2.tar.bz2
linux-stable-e704966c45e48d0220d1ee5e463034ae493a95b2.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Dmitry writes: "Input updates for v4.19-rc5 Just a few driver fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: uinput - allow for max == min during input_absinfo validation Input: elantech - enable middle button of touchpad on ThinkPad P72 Input: atakbd - fix Atari CapsLock behaviour Input: atakbd - fix Atari keymap Input: egalax_ts - add system wakeup support Input: gpio-keys - fix a documentation index issue
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/input/gpio-keys.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/input/gpio-keys.txt b/Documentation/devicetree/bindings/input/gpio-keys.txt
index 996ce84352cb..7cccc49b6bea 100644
--- a/Documentation/devicetree/bindings/input/gpio-keys.txt
+++ b/Documentation/devicetree/bindings/input/gpio-keys.txt
@@ -1,4 +1,4 @@
-Device-Tree bindings for input/gpio_keys.c keyboard driver
+Device-Tree bindings for input/keyboard/gpio_keys.c keyboard driver
Required properties:
- compatible = "gpio-keys";