summaryrefslogtreecommitdiff
path: root/drivers/media/usb/dvb-usb/Makefile
diff options
context:
space:
mode:
authorAkihiro Tsukada <tskd08@gmail.com>2018-06-10 10:45:31 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-07-30 08:50:25 -0400
commitb30cc07de8a903685441f9770b1b21e1422d2468 (patch)
treec2701116a68777fdaa583d041711dbbe6213b224 /drivers/media/usb/dvb-usb/Makefile
parentf609e7a0f3956e3b03af735b83600a4eef2a04ec (diff)
downloadlwn-b30cc07de8a903685441f9770b1b21e1422d2468.tar.gz
lwn-b30cc07de8a903685441f9770b1b21e1422d2468.zip
media: dvb-usb/friio, dvb-usb-v2/gl861: decompose friio and merge with gl861
Friio device contains "gl861" bridge and "tc90522" demod, for which the separate drivers are already in the kernel. But friio driver was monolithic and did not use them, practically copying those features. This patch decomposes friio driver into sub drivers and re-uses existing ones, thus reduces some code. It adds some features to gl861, to support the friio-specific init/config of the devices and implement i2c communications to the tuner via demod with USB vendor requests. [mchehab+samsung@kernel.org: fix merge conflicts] Signed-off-by: Akihiro Tsukada <tskd08@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/usb/dvb-usb/Makefile')
-rw-r--r--drivers/media/usb/dvb-usb/Makefile3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/usb/dvb-usb/Makefile b/drivers/media/usb/dvb-usb/Makefile
index 9ad2618408ef..407d90ca8be0 100644
--- a/drivers/media/usb/dvb-usb/Makefile
+++ b/drivers/media/usb/dvb-usb/Makefile
@@ -71,9 +71,6 @@ obj-$(CONFIG_DVB_USB_DTV5100) += dvb-usb-dtv5100.o
dvb-usb-cinergyT2-objs := cinergyT2-core.o cinergyT2-fe.o
obj-$(CONFIG_DVB_USB_CINERGY_T2) += dvb-usb-cinergyT2.o
-dvb-usb-friio-objs := friio.o friio-fe.o
-obj-$(CONFIG_DVB_USB_FRIIO) += dvb-usb-friio.o
-
dvb-usb-az6027-objs := az6027.o
obj-$(CONFIG_DVB_USB_AZ6027) += dvb-usb-az6027.o