56a263aaa0
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>
36 lines
759 B
Makefile
36 lines
759 B
Makefile
#
|
|
# Makefile for the kernel multimedia device drivers.
|
|
#
|
|
|
|
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
|
|
#
|
|
obj-y += i2c/ tuners/
|
|
obj-$(CONFIG_DVB_CORE) += dvb-frontends/
|
|
|
|
#
|
|
# Now, let's link-in the media core
|
|
#
|
|
ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
|
|
obj-$(CONFIG_MEDIA_SUPPORT) += media.o
|
|
endif
|
|
|
|
obj-$(CONFIG_VIDEO_DEV) += v4l2-core/
|
|
obj-$(CONFIG_DVB_CORE) += dvb-core/
|
|
|
|
# There are both core and drivers at RC subtree - merge before drivers
|
|
obj-y += rc/
|
|
|
|
#
|
|
# Finally, merge the drivers that require the core
|
|
#
|
|
|
|
obj-y += common/ platform/ pci/ usb/ mmc/ firewire/ spi/
|
|
obj-$(CONFIG_VIDEO_DEV) += radio/
|
|
|