summaryrefslogtreecommitdiffstats
path: root/Documentation/gpio
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-09-21 16:38:09 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-09-21 16:38:09 -0700
commit95a0c7c2d6cfde3fb5fdb713428ed0df4d6bdd58 (patch)
treeeed1998bf14a6193c3f1ccd9b2b638fba6f69088 /Documentation/gpio
parent1dbc080c9ef6bcfba652ef0d6ae919b8c7c85a1d (diff)
parenta205425658dead19bb1b8ac00584aed98e60dde2 (diff)
downloadlinux-95a0c7c2d6cfde3fb5fdb713428ed0df4d6bdd58.tar.bz2
Merge tag 'ib-mfd-many-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into next
Merge "Immutable branch between MFD and many other subsystems due for the v4.14 merge window" to get the TWL headers moved to the right place.
Diffstat (limited to 'Documentation/gpio')
-rw-r--r--Documentation/gpio/gpio-legacy.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gpio/gpio-legacy.txt b/Documentation/gpio/gpio-legacy.txt
index b34fd94f7089..5eacc147ea87 100644
--- a/Documentation/gpio/gpio-legacy.txt
+++ b/Documentation/gpio/gpio-legacy.txt
@@ -459,7 +459,7 @@ pin controller?
This is done by registering "ranges" of pins, which are essentially
cross-reference tables. These are described in
-Documentation/pinctrl.txt
+Documentation/driver-api/pinctl.rst
While the pin allocation is totally managed by the pinctrl subsystem,
gpio (under gpiolib) is still maintained by gpio drivers. It may happen