aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/Makefile
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2016-07-01 07:33:10 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-08 18:34:00 -0300
commit5bb2399a4fe4a1703c1497b4838c5e8e869d0822 (patch)
tree7a253cb5c009c25e5074a07abc002b1ed9f39eb2 /drivers/media/Makefile
parentea8c535e30c1066a0bf8acb2d39bb3c4e643a034 (diff)
[media] cec: fix Kconfig dependency problems
- Use IS_REACHABLE(RC_CORE) instead of IS_ENABLED: if cec is built-in and RC_CORE is a module, then CEC can't reach the RC symbols. - Both cec and cec-edid should be bool and use the same build 'mode' as MEDIA_SUPPORT (just as is done for the media controller code). - Add a note to staging that this should be changed once the cec framework is moved out of staging. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Reported-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/Makefile')
-rw-r--r--drivers/media/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index b56f013b78c3..081a7866fd44 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -2,7 +2,9 @@
# Makefile for the kernel multimedia device drivers.
#
-obj-$(CONFIG_MEDIA_CEC_EDID) += cec-edid.o
+ifeq ($(CONFIG_MEDIA_CEC_EDID),y)
+ obj-$(CONFIG_MEDIA_SUPPORT) += cec-edid.o
+endif
media-objs := media-device.o media-devnode.o media-entity.o

Privacy Policy