summaryrefslogtreecommitdiff
path: root/Documentation/driver-api/generic-counter.rst
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-03 14:53:20 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-03 14:53:20 +0300
commit888dc273ea4e7ca332a6f73d10dfc8f2b212c803 (patch)
tree0c2154dfa92ca6ee761c358e58a3e35831558bb5 /Documentation/driver-api/generic-counter.rst
parent324e8f5f5d9d4d0b9a608b2fdb88cd93b0fbb12a (diff)
parentf2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff)
downloadlinux-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.tar.xz
Merge 5.2-rc3 into tty-next
We want the tty/serial fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/driver-api/generic-counter.rst')
-rw-r--r--Documentation/driver-api/generic-counter.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/driver-api/generic-counter.rst b/Documentation/driver-api/generic-counter.rst
index f51db893f595..0c161b1a3be6 100644
--- a/Documentation/driver-api/generic-counter.rst
+++ b/Documentation/driver-api/generic-counter.rst
@@ -251,7 +251,7 @@ for defining a counter device.
.. kernel-doc:: include/linux/counter.h
:internal:
-.. kernel-doc:: drivers/counter/generic-counter.c
+.. kernel-doc:: drivers/counter/counter.c
:export:
Implementation