Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/topcliff-pch' into...

[karo-tx-linux.git] / drivers / staging / media / Makefile

diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 906257e94dda894f4f6c9b208ac07548b8f2c04b..a28e82cf6447a932c92a807b0aa290dfa56aae04 100644 (file)
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -1,9 +1,7 @@
 obj-$(CONFIG_I2C_BCM2048)      += bcm2048/
-obj-$(CONFIG_MEDIA_CEC)                += cec/
 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p-cec/
 obj-$(CONFIG_DVB_CXD2099)      += cxd2099/
 obj-$(CONFIG_LIRC_STAGING)     += lirc/
 obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/
 obj-$(CONFIG_VIDEO_OMAP4)      += omap4iss/
-obj-$(CONFIG_USB_PULSE8_CEC)    += pulse8-cec/
 obj-$(CONFIG_VIDEO_STI_HDMI_CEC) += st-cec/