diff options
| author |  Mauro Carvalho Chehab <mchehab@s-opensource.com>
| 2016-07-09 10:21:36 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com>
| 2016-07-09 10:21:36 -0300 |
| commit | 6a6e8090069d0f026261cb53b574401acf0e42d0 (patch) | |
| tree | b63f7b70f1a51dca8fd5f8b3ddafe7454307278c /Documentation/DocBook/device-drivers.tmpl | |
| parent | [media] doc-rst: add media.h header to media contrller (diff) | |
| parent | [media] DocBook/media: add CEC documentation (diff) | |
| download | linux-6a6e8090069d0f026261cb53b574401acf0e42d0.tar.gz linux-6a6e8090069d0f026261cb53b574401acf0e42d0.tar.bz2 linux-6a6e8090069d0f026261cb53b574401acf0e42d0.zip | |
Merge branch 'topic/cec' into topic/docs-next
* 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
Input: add HDMI CEC specific keycodes
Input: add BUS_CEC type
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 de79efdad46c..a20a45b45c30 100644 --- a/Documentation/DocBook/device-drivers.tmpl +++ b/Documentation/DocBook/device-drivers.tmpl @@ -272,6 +272,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> |