diff options
| author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-08 18:16:10 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-08 18:16:10 -0300 |
| commit | cbb5c8355aaf42e95f1b925bb5ded494dea540d9 (patch) | |
| tree | 168cbe90a17e4ef984178d85512d03268ed4fea9 /drivers/media/rc | |
| parent | fb810cb5eda8c47e3afbb45ea6b9676841d29e8d (diff) | |
| parent | c7169ad5616229b87cabf886bc5f9cbd1fc35a5f (diff) | |
| download | linux-cbb5c8355aaf42e95f1b925bb5ded494dea540d9.tar.gz linux-cbb5c8355aaf42e95f1b925bb5ded494dea540d9.tar.bz2 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 'drivers/media/rc')
| -rw-r--r-- | drivers/media/rc/rc-main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c index 601ca2337e45..8e7f2929fa6f 100644 --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c @@ -810,6 +810,7 @@ static const struct { { RC_BIT_SHARP, "sharp", "ir-sharp-decoder" }, { RC_BIT_MCE_KBD, "mce_kbd", "ir-mce_kbd-decoder" }, { RC_BIT_XMP, "xmp", "ir-xmp-decoder" }, + { RC_BIT_CEC, "cec", NULL }, }; /** |