summaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook/Makefile
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2016-11-18 16:19:28 -0700
committerJonathan Corbet <corbet@lwn.net>2016-11-18 16:19:28 -0700
commit726d661fea3e3f76d36515c74e4ce58e7789418e (patch)
tree0f996a1d5c0cca796b135378beb66e9829fae854 /Documentation/DocBook/Makefile
parent917fef6f7ee8b2fe852692ac49771342bfef9433 (diff)
parentc6ab9e57e84ee015bb9c5de213d9f85e5fd4e085 (diff)
downloadlinux-726d661fea3e3f76d36515c74e4ce58e7789418e.tar.bz2
Merge remote-tracking branch 'sound/topic/restize-docs' into sound
Bring in the sphinxification of the sound documentation.
Diffstat (limited to 'Documentation/DocBook/Makefile')
-rw-r--r--Documentation/DocBook/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 857b772e9da1..c8bd257660eb 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -12,8 +12,7 @@ DOCBOOKS := z8530book.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 uio-howto.xml scsi.xml \
- debugobjects.xml sh.xml regulator.xml \
- alsa-driver-api.xml writing-an-alsa-driver.xml \
+ 80211.xml debugobjects.xml sh.xml regulator.xml \
tracepoint.xml w1.xml \
writing_musb_glue_layer.xml crypto-API.xml iio.xml