path: root/drivers/media/Makefile
diff options
authorHans Verkuil <hans.verkuil@cisco.com>2017-04-17 07:44:35 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-04-19 06:50:52 -0300
commit56a263aaa0a5f58d70517fae2bdd63fc1e17efec (patch)
tree12804cdac321eb61783ac32901cf13fbeabf0a3e /drivers/media/Makefile
parentee0fe833d96793853335844b6d99fb76bd12cbeb (diff)
[media] cec: Kconfig cleanup
The Kconfig options for the CEC subsystem were a bit messy. In addition there were two cec sources (cec-edid.c and cec-notifier.c) that were outside of the media/cec directory, which was weird. Move those sources to media/cec as well. The cec-edid and cec-notifier functionality is now part of the cec module and these are no longer separate modules. Also remove the MEDIA_CEC_EDID config option and include it with the main CEC config option (which defined CEC_EDID anyway). Added static inlines to cec-edid.h for dummy functions when CEC_CORE isn't defined. CEC drivers should now depend on CEC_CORE. CEC drivers that need the cec-notifier functionality must explicitly select CEC_NOTIFIER. The s5p-cec and stih-cec drivers depended on VIDEO_DEV instead of CEC_CORE, fix that as well. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/Makefile')
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 8b36a571d443..523fea3648ad 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -2,20 +2,10 @@
# Makefile for the kernel multimedia device drivers.
- obj-$(CONFIG_MEDIA_SUPPORT) += cec-edid.o
- obj-$(CONFIG_MEDIA_SUPPORT) += cec-notifier.o
- obj-$(CONFIG_MEDIA_SUPPORT) += cec/
media-objs := media-device.o media-devnode.o media-entity.o
+obj-$(CONFIG_CEC_CORE) += cec/
# I2C drivers should come before other drivers, otherwise they'll fail
# when compiled as builtin drivers

Privacy Policy