path: root/drivers/media/Makefile
diff options
authorHans Verkuil <hans.verkuil@cisco.com>2017-05-28 05:48:37 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-06-04 15:23:33 -0300
commit9177e51d1434076a91f9bfb693deae8b955d6d57 (patch)
treec0c4bceeb75daee0eda2df74feecd4586521da3c /drivers/media/Makefile
parentca33784ba4949856a94a545c91429aae5c8b658d (diff)
[media] cec: select CEC_CORE instead of depend on it
The CEC framework is used by both drm and media. That makes it tricky to get the dependencies right. This patch moves the CEC_CORE and MEDIA_CEC_NOTIFIER config options out of the media menu and instead drivers that want to use CEC should select CEC_CORE and MEDIA_CEC_NOTIFIER (if needed). Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/Makefile')
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 523fea3648ad..044503aa8801 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -4,8 +4,6 @@
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
@@ -26,6 +24,8 @@ obj-$(CONFIG_DVB_CORE) += dvb-core/
# There are both core and drivers at RC subtree - merge before drivers
obj-y += rc/
+obj-$(CONFIG_CEC_CORE) += cec/
# Finally, merge the drivers that require the core

Privacy Policy