summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/dvb-usb/Kconfig
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-09-24 13:37:51 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-09-24 13:37:51 -0300
commit6d9b3e7e1bd9a2e8e3d2dde50f3d639029ab1241 (patch)
tree2029f5d6ec8f39e55681751bc736252dadeb3715 /linux/drivers/media/dvb/dvb-usb/Kconfig
parentec1abc6d3b2508366efa97c0f3f08078902e47ac (diff)
parent60068c572f087679b3b93155ec10c660ea932da8 (diff)
downloadmediapointer-dvb-s2-6d9b3e7e1bd9a2e8e3d2dde50f3d639029ab1241.tar.gz
mediapointer-dvb-s2-6d9b3e7e1bd9a2e8e3d2dde50f3d639029ab1241.tar.bz2
merge: http://www.linuxtv.org/hg/~stoth/s2
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb/Kconfig')
-rw-r--r--linux/drivers/media/dvb/dvb-usb/Kconfig8
1 files changed, 5 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/Kconfig b/linux/drivers/media/dvb/dvb-usb/Kconfig
index b35d7f0db..aee3b5dd6 100644
--- a/linux/drivers/media/dvb/dvb-usb/Kconfig
+++ b/linux/drivers/media/dvb/dvb-usb/Kconfig
@@ -247,12 +247,14 @@ config DVB_USB_AF9005_REMOTE
Afatech AF9005 based receiver.
config DVB_USB_DW2102
- tristate "DvbWorld 2102 DVB-S USB2.0 receiver"
+ tristate "DvbWorld DVB-S/S2 USB2.0 support"
depends on DVB_USB
- select DVB_STV0299 if !DVB_FE_CUSTOMISE
select DVB_PLL if !DVB_FE_CUSTOMISE
+ select DVB_STV0299 if !DVB_FE_CUSTOMISE
+ select DVB_CX24116 if !DVB_FE_CUSTOMISE
help
- Say Y here to support the DvbWorld 2102 DVB-S USB2.0 receiver.
+ Say Y here to support the DvbWorld DVB-S/S2 USB2.0 receivers
+ and the TeVii S650.
config DVB_USB_ANYSEE
tristate "Anysee DVB-T/C USB2.0 support"