summaryrefslogtreecommitdiff
path: root/Documentation/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-03-04 22:32:18 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2017-03-04 22:32:18 +0300
commitbe834aafdf5f8a37c191e697ac8ee6d53ab5020c (patch)
treee5c4bce3fd97c046c7367b9eb46d25b35c2f84aa /Documentation/media
parent91aff98b79f10bf38c0d51b2d8538ecca35f916e (diff)
parentfd5d666932d51b2552ecc0280047d6b35d9b6cd1 (diff)
downloadlinux-be834aafdf5f8a37c191e697ac8ee6d53ab5020c.tar.xz
Merge tag 'docs-4.11-fixes' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet: "A few fixes for the docs tree, including one for a 4.11 build regression" * tag 'docs-4.11-fixes' of git://git.lwn.net/linux: Documentation/sphinx: fix primary_domain configuration docs: Fix htmldocs build failure doc/ko_KR/memory-barriers: Update control-dependencies section pcieaer doc: update the link Documentation: Update path to sysrq.txt
Diffstat (limited to 'Documentation/media')
-rw-r--r--Documentation/media/v4l-drivers/bttv.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/media/v4l-drivers/bttv.rst b/Documentation/media/v4l-drivers/bttv.rst
index bc63b12efafd..195ccaac2816 100644
--- a/Documentation/media/v4l-drivers/bttv.rst
+++ b/Documentation/media/v4l-drivers/bttv.rst
@@ -312,7 +312,7 @@ information out of a register+stack dump printed by the kernel on
protection faults (so-called "kernel oops").
If you run into some kind of deadlock, you can try to dump a call trace
-for each process using sysrq-t (see Documentation/sysrq.txt).
+for each process using sysrq-t (see Documentation/admin-guide/sysrq.rst).
This way it is possible to figure where *exactly* some process in "D"
state is stuck.