Skip to content

Commit c1ece76

Browse files
committed
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
2 parents fb1b83d + 292eaf5 commit c1ece76

File tree

235 files changed

+49
-62566
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+49
-62566
lines changed

Documentation/DocBook/Makefile

+2-8
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ DOCBOOKS := z8530book.xml device-drivers.xml \
1616
genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
1717
80211.xml debugobjects.xml sh.xml regulator.xml \
1818
alsa-driver-api.xml writing-an-alsa-driver.xml \
19-
tracepoint.xml media_api.xml w1.xml \
19+
tracepoint.xml w1.xml \
2020
writing_musb_glue_layer.xml crypto-API.xml iio.xml
2121

22-
include Documentation/DocBook/media/Makefile
23-
2422
###
2523
# The build process is as follows (targets):
2624
# (xmldocs) [by docproc]
@@ -49,7 +47,6 @@ pdfdocs: $(PDF)
4947
HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
5048
htmldocs: $(HTML)
5149
$(call cmd,build_main_index)
52-
$(call install_media_images)
5350

5451
MAN := $(patsubst %.xml, %.9, $(BOOKS))
5552
mandocs: $(MAN)
@@ -219,9 +216,6 @@ silent_gen_xml = :
219216

220217
else
221218

222-
# Needed, due to cleanmediadocs
223-
include Documentation/DocBook/media/Makefile
224-
225219
htmldocs:
226220
pdfdocs:
227221
psdocs:
@@ -269,7 +263,7 @@ clean-files := $(DOCBOOKS) \
269263

270264
clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man
271265

272-
cleandocs: cleanmediadocs
266+
cleandocs:
273267
$(Q)rm -f $(call objectify, $(clean-files))
274268
$(Q)rm -rf $(call objectify, $(clean-dirs))
275269

Documentation/DocBook/media/.gitignore

-1
This file was deleted.

0 commit comments

Comments
 (0)