summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-06-18 06:32:09 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-06-18 06:32:09 -0300
commitc659a9e10a6f0db8b970b782f20a32e52d80c30c (patch)
tree998165d040a46cb0f5b68c5412314cd7b59eadcc
parente9a2903738b77344c7ee290eb85ba671a6a68b26 (diff)
parentaaede485dae05a1193a0738d54bbf20b51e32bdb (diff)
downloadmediapointer-dvb-s2-c659a9e10a6f0db8b970b782f20a32e52d80c30c.tar.gz
mediapointer-dvb-s2-c659a9e10a6f0db8b970b782f20a32e52d80c30c.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/fix
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--linux/drivers/media/dvb/dvb-usb/Kconfig1
-rw-r--r--linux/drivers/media/dvb/ttpci/Kconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/Kconfig b/linux/drivers/media/dvb/dvb-usb/Kconfig
index cae574fa7..bee1bf3c9 100644
--- a/linux/drivers/media/dvb/dvb-usb/Kconfig
+++ b/linux/drivers/media/dvb/dvb-usb/Kconfig
@@ -120,6 +120,7 @@ config DVB_USB_M920X
depends on DVB_USB
select DVB_MT352 if !DVB_FE_CUSTOMISE
select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE
+ select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE
help
Say Y here to support the MSI Mega Sky 580 USB2.0 DVB-T receiver.
Currently, only devices with a product id of
diff --git a/linux/drivers/media/dvb/ttpci/Kconfig b/linux/drivers/media/dvb/ttpci/Kconfig
index 0816344e0..87c973ac6 100644
--- a/linux/drivers/media/dvb/ttpci/Kconfig
+++ b/linux/drivers/media/dvb/ttpci/Kconfig
@@ -107,6 +107,7 @@ config DVB_BUDGET_CI
select DVB_TDA1004X if !DVB_FE_CUSTOMISE
select DVB_LNBP21 if !DVB_FE_CUSTOMISE
select DVB_TDA10023 if !DVB_FE_CUSTOMISE
+ select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE
select VIDEO_IR
help
Support for simple SAA7146 based DVB cards