The last open issues have been addressed, so it is time to move this out of staging and into the mainline and to move the public cec headers to include/uapi/linux. Conflicts: Documentation/media/Makefile drivers/media/i2c/Kconfig drivers/media/platform/vivid/Kconfig drivers/staging/media/Makefile drivers/staging/media/pulse8-cec/Kconfig drivers/staging/media/s5p-cec/Kconfig drivers/staging/media/st-cec/Kconfig Change-Id: Ie46e780a7d29d773dbb9bd642059695eb580e8ad Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Git-commit: 0dbacebede1e4e44bf500f94d692fad05eb2c293 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git [rayz@codeaurora.org: make some modifications to the original patch to fix the cherry-pick conflicts. (1) discard the changes in Documentation. (2) discard the CEC adapter driver changes for other vendors because they are not needed.] Signed-off-by: Ray Zhang <rayz@codeaurora.org>
5 lines
127 B
Makefile
5 lines
127 B
Makefile
cec-objs := cec-core.o cec-adap.o cec-api.o
|
|
|
|
ifeq ($(CONFIG_MEDIA_CEC_SUPPORT),y)
|
|
obj-$(CONFIG_MEDIA_SUPPORT) += cec.o
|
|
endif
|