(This supersedes my previous two CEC pull request) This adds the missing rc-cec keymap module, two bugfixes, Kconfig fixes from Arnd and it dual-licenses the headers for BSD, just as we do for videodev2.h. I originally thought the rc-cec module was already merged in the cec topic branch, but I later discovered that it wasn't. Regards, Hans The following changes since commit c7169ad5616229b87cabf886bc5f9cbd1fc35a5f: [media] DocBook/media: add CEC documentation (2016-06-28 11:45:24 -0300) are available in the git repository at: git://linuxtv.org/hverkuil/media_tree.git cec-topic2 for you to fetch changes up to bdc720ea67e511d1845089d0e3558aa33364a92b: cec: fix Kconfig dependency problems (2016-07-01 12:33:10 +0200) ---------------------------------------------------------------- Arnd Bergmann (2): s5p_cec: mark suspend/resume as __maybe_unused cec: add MEDIA_SUPPORT dependency Hans Verkuil (4): cec-adap: on reply, restore the tx_status value from the transmit cec.h/cec-funcs.h: add option to use BSD license cec-adap: prevent write to out-of-bounds array index cec: fix Kconfig dependency problems Kamil Debski (1): rc-cec: Add HDMI CEC keymap module drivers/media/Kconfig | 2 +- drivers/media/Makefile | 4 +- drivers/media/rc/keymaps/Makefile | 1 + drivers/media/rc/keymaps/rc-cec.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/staging/media/cec/Kconfig | 3 +- drivers/staging/media/cec/Makefile | 4 +- drivers/staging/media/cec/TODO | 5 ++ drivers/staging/media/cec/cec-adap.c | 18 +++--- drivers/staging/media/cec/cec-core.c | 10 ++-- drivers/staging/media/s5p-cec/s5p_cec.c | 4 +- include/linux/cec-funcs.h | 16 ++++++ include/linux/cec.h | 16 ++++++ 12 files changed, 247 insertions(+), 18 deletions(-) create mode 100644 drivers/media/rc/keymaps/rc-cec.c -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html