diff options
| author | Mauro Carvalho Chehab | 2016-07-08 23:16:10 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2016-07-08 23:16:10 +0200 |
| commit | cbb5c8355aaf42e95f1b925bb5ded494dea540d9 (patch) | |
| tree | 168cbe90a17e4ef984178d85512d03268ed4fea9 /Documentation/DocBook/device-drivers.tmpl | |
| parent | Merge tag 'v4.7-rc6' into patchwork (diff) | |
| parent | [media] DocBook/media: add CEC documentation (diff) | |
| download | kernel-qcow2-linux-cbb5c8355aaf42e95f1b925bb5ded494dea540d9.tar.gz kernel-qcow2-linux-cbb5c8355aaf42e95f1b925bb5ded494dea540d9.tar.xz kernel-qcow2-linux-cbb5c8355aaf42e95f1b925bb5ded494dea540d9.zip | |
Merge branch 'topic/cec' into patchwork
* topic/cec:
[media] DocBook/media: add CEC documentation
[media] s5p_cec: get rid of an unused var
[media] move s5p-cec to staging
[media] vivid: add CEC emulation
[media] cec: s5p-cec: Add s5p-cec driver
[media] cec: adv7511: add cec support
[media] cec: adv7842: add cec support
[media] cec: adv7604: add cec support
[media] cec: add compat32 ioctl support
[media] cec/TODO: add TODO file so we know why this is still in staging
[media] cec: add HDMI CEC framework (api)
[media] cec: add HDMI CEC framework (adapter)
[media] cec: add HDMI CEC framework (core)
[media] cec-funcs.h: static inlines to pack/unpack CEC messages
[media] cec.h: add cec header
[media] cec-edid: add module for EDID CEC helper functions
[media] cec.txt: add CEC framework documentation
[media] rc: Add HDMI CEC protocol handling
Diffstat (limited to 'Documentation/DocBook/device-drivers.tmpl')
| -rw-r--r-- | Documentation/DocBook/device-drivers.tmpl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl index 8c68768ebee5..58af32b01b90 100644 --- a/Documentation/DocBook/device-drivers.tmpl +++ b/Documentation/DocBook/device-drivers.tmpl @@ -300,6 +300,9 @@ X!Isound/sound_firmware.c !Iinclude/media/media-devnode.h !Iinclude/media/media-entity.h </sect1> + <sect1><title>Consumer Electronics Control devices</title> +!Iinclude/media/cec-edid.h + </sect1> </chapter> |