diff options
| author | Linus Torvalds | 2016-08-04 15:59:37 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2016-08-04 15:59:37 +0200 |
| commit | c1ece76719205690f4b448460d9b85c130e8021b (patch) | |
| tree | 01072c593d53ef551788228ea28ce8bc87bc0e45 /Documentation/DocBook/Makefile | |
| parent | Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | [media] cec: fix off-by-one memset (diff) | |
| download | kernel-qcow2-linux-c1ece76719205690f4b448460d9b85c130e8021b.tar.gz kernel-qcow2-linux-c1ece76719205690f4b448460d9b85c130e8021b.tar.xz kernel-qcow2-linux-c1ece76719205690f4b448460d9b85c130e8021b.zip | |
Merge tag 'media/v4.8-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media DocBook removal and some fixups from Mauro Carvalho Chehab:
- removal of the media DocBook (since it's all in Sphinx now)
- videobuf2: Fix an allocation regression
- a few fixes related to the CEC drivers
* tag 'media/v4.8-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] cec: fix off-by-one memset
[media] staging: add MEDIA_SUPPORT dependency
[media] vivid: don't handle CEC_MSG_SET_STREAM_PATH
[media] media: adv7180: Fix broken interrupt register access
[media] vb2: Fix allocation size of dma_parms
[media] vim2m: copy the other colorspace-related fields as well
[media] adv7511: fix VIC autodetect
doc-rst: Remove the media docbook
Diffstat (limited to 'Documentation/DocBook/Makefile')
| -rw-r--r-- | Documentation/DocBook/Makefile | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index 8e6dd4b14314..c481df33ef21 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile @@ -16,11 +16,9 @@ DOCBOOKS := z8530book.xml device-drivers.xml \ genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \ 80211.xml debugobjects.xml sh.xml regulator.xml \ alsa-driver-api.xml writing-an-alsa-driver.xml \ - tracepoint.xml media_api.xml w1.xml \ + tracepoint.xml w1.xml \ writing_musb_glue_layer.xml crypto-API.xml iio.xml -include Documentation/DocBook/media/Makefile - ### # The build process is as follows (targets): # (xmldocs) [by docproc] @@ -49,7 +47,6 @@ pdfdocs: $(PDF) HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS))) htmldocs: $(HTML) $(call cmd,build_main_index) - $(call install_media_images) MAN := $(patsubst %.xml, %.9, $(BOOKS)) mandocs: $(MAN) @@ -219,9 +216,6 @@ silent_gen_xml = : else -# Needed, due to cleanmediadocs -include Documentation/DocBook/media/Makefile - htmldocs: pdfdocs: psdocs: @@ -269,7 +263,7 @@ clean-files := $(DOCBOOKS) \ clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man -cleandocs: cleanmediadocs +cleandocs: $(Q)rm -f $(call objectify, $(clean-files)) $(Q)rm -rf $(call objectify, $(clean-dirs)) |