summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-24 15:16:41 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-24 15:16:41 +0200
commit02214bfc89c71bcc5167f653994cfa5c57f10ff1 (patch)
tree078e9eb79f9a58d996c959bcc935317f8cbecfa9 /Documentation
parent6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 (diff)
parent324493fba77500592bbaa66421729421f139d4b5 (diff)
Merge tag 'media/v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Mauro briefly writes: "media fixes for v4.19-rc5 some drivers and Kbuild fixes" * tag 'media/v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: media: platform: fix cros-ec-cec build error media: staging/media/mt9t031/Kconfig: remove bogus entry media: i2c: mt9v111: Fix v4l2-ctrl error handling media: camss: add missing includes media: camss: Use managed memory allocations media: camss: mark PM functions as __maybe_unused media: af9035: prevent buffer overflow on write media: video_function_calls.rst: drop obsolete video-set-attributes reference
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/media/uapi/dvb/video_function_calls.rst1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/media/uapi/dvb/video_function_calls.rst b/Documentation/media/uapi/dvb/video_function_calls.rst
index 3f4f6c9ffad7..a4222b6cd2d3 100644
--- a/Documentation/media/uapi/dvb/video_function_calls.rst
+++ b/Documentation/media/uapi/dvb/video_function_calls.rst
@@ -33,4 +33,3 @@ Video Function Calls
video-clear-buffer
video-set-streamtype
video-set-format
- video-set-attributes