diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2014-11-20 21:46:04 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-11-20 21:46:04 +0100 |
| commit | a69862d8d04e4877965cc938140c9f8e6da0b827 (patch) | |
| tree | 667cace5c2fad872871e4d24d0c895664f0e0bc6 /Documentation/DocBook | |
| parent | ALSA: hda/realtek - Clean up mute/mic GPIO LED handling (diff) | |
| parent | ALSA: usb-audio: Use snd_usb_ctl_msg() for Native Instruments quirk (diff) | |
| download | linux-dev-a69862d8d04e4877965cc938140c9f8e6da0b827.tar.xz linux-dev-a69862d8d04e4877965cc938140c9f8e6da0b827.zip | |
Merge branch 'for-linus' into test/usb-resume
Diffstat (limited to 'Documentation/DocBook')
| -rw-r--r-- | Documentation/DocBook/media/Makefile | 2 | ||||
| -rw-r--r-- | Documentation/DocBook/media/v4l/compat.xml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/DocBook/media/Makefile b/Documentation/DocBook/media/Makefile index df2962d9e11e..8bf7c6191296 100644 --- a/Documentation/DocBook/media/Makefile +++ b/Documentation/DocBook/media/Makefile @@ -25,7 +25,7 @@ GENFILES := $(addprefix $(MEDIA_OBJ_DIR)/, $(MEDIA_TEMP)) PHONY += cleanmediadocs cleanmediadocs: - -@rm `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(OBJIMGFILES) 2>/dev/null + -@rm -f `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(OBJIMGFILES) 2>/dev/null $(obj)/media_api.xml: $(GENFILES) FORCE diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml index 07ffc76553ba..0a2debfa68f6 100644 --- a/Documentation/DocBook/media/v4l/compat.xml +++ b/Documentation/DocBook/media/v4l/compat.xml @@ -2566,6 +2566,10 @@ fields changed from _s32 to _u32. <para>Added compound control types and &VIDIOC-QUERY-EXT-CTRL;. </para> </listitem> + </orderedlist> + </section> + + <section> <title>V4L2 in Linux 3.18</title> <orderedlist> <listitem> |