diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-04 11:32:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-04 11:32:18 -0800 |
| commit | be834aafdf5f8a37c191e697ac8ee6d53ab5020c (patch) | |
| tree | e5c4bce3fd97c046c7367b9eb46d25b35c2f84aa /Documentation/DocBook | |
| parent | 91aff98b79f10bf38c0d51b2d8538ecca35f916e (diff) | |
| parent | fd5d666932d51b2552ecc0280047d6b35d9b6cd1 (diff) | |
| download | talos-obmc-linux-be834aafdf5f8a37c191e697ac8ee6d53ab5020c.tar.gz talos-obmc-linux-be834aafdf5f8a37c191e697ac8ee6d53ab5020c.zip | |
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/DocBook')
| -rw-r--r-- | Documentation/DocBook/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index 60a17b7da834..164c1c76971f 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile @@ -7,12 +7,12 @@ # list of DOCBOOKS. DOCBOOKS := z8530book.xml \ - kernel-hacking.xml kernel-locking.xml deviceiobook.xml \ + kernel-hacking.xml kernel-locking.xml \ writing_usb_driver.xml networking.xml \ kernel-api.xml filesystems.xml lsm.xml kgdb.xml \ gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ genericirq.xml s390-drivers.xml scsi.xml \ - sh.xml regulator.xml w1.xml \ + sh.xml w1.xml \ writing_musb_glue_layer.xml ifeq ($(DOCBOOKS),) |
