diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2017-04-17 07:44:35 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-04-19 06:50:52 -0300 |
commit | 56a263aaa0a5f58d70517fae2bdd63fc1e17efec (patch) | |
tree | 12804cdac321eb61783ac32901cf13fbeabf0a3e /drivers/media/cec/Makefile | |
parent | ee0fe833d96793853335844b6d99fb76bd12cbeb (diff) | |
download | linux-56a263aaa0a5f58d70517fae2bdd63fc1e17efec.tar.gz linux-56a263aaa0a5f58d70517fae2bdd63fc1e17efec.tar.bz2 linux-56a263aaa0a5f58d70517fae2bdd63fc1e17efec.zip |
[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/cec/Makefile')
-rw-r--r-- | drivers/media/cec/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/cec/Makefile b/drivers/media/cec/Makefile index d6686337275f..402a6c62a3e8 100644 --- a/drivers/media/cec/Makefile +++ b/drivers/media/cec/Makefile @@ -1,5 +1,7 @@ -cec-objs := cec-core.o cec-adap.o cec-api.o +cec-objs := cec-core.o cec-adap.o cec-api.o cec-edid.o -ifeq ($(CONFIG_MEDIA_CEC_SUPPORT),y) - obj-$(CONFIG_MEDIA_SUPPORT) += cec.o +ifeq ($(CONFIG_MEDIA_CEC_NOTIFIER),y) + cec-objs += cec-notifier.o endif + +obj-$(CONFIG_CEC_CORE) += cec.o |