From cc66a99069b764afda0bdb8ce88cf44d214ead71 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 29 Apr 2008 21:38:45 -0300 Subject: [PATCH] --- yaml --- r: 94935 b: refs/heads/master c: b094516f9589245617eb5d0452769826063f72ac h: refs/heads/master i: 94933: 23731e209f1de6acfc9ed1c0b81763d9c9a0425e 94931: 3521ab09c4d173d8a74ce7ec425081b018729e0b 94927: 5f5e1203a5545424fd5b1d920eb5f11a06b70cb5 v: v3 --- [refs] | 2 +- trunk/drivers/media/common/tuners/Kconfig | 28 +++++++++++++++++ trunk/drivers/media/common/tuners/Makefile | 4 +++ .../{dvb/frontends => common/tuners}/mt2060.c | 0 .../{dvb/frontends => common/tuners}/mt2060.h | 0 .../frontends => common/tuners}/mt2060_priv.h | 0 .../{dvb/frontends => common/tuners}/mt2131.c | 0 .../{dvb/frontends => common/tuners}/mt2131.h | 0 .../frontends => common/tuners}/mt2131_priv.h | 0 .../{dvb/frontends => common/tuners}/mt2266.c | 0 .../{dvb/frontends => common/tuners}/mt2266.h | 0 .../{dvb/frontends => common/tuners}/qt1010.c | 0 .../{dvb/frontends => common/tuners}/qt1010.h | 0 .../frontends => common/tuners}/qt1010_priv.h | 0 trunk/drivers/media/dvb/frontends/Kconfig | 30 +------------------ trunk/drivers/media/dvb/frontends/Makefile | 4 --- 16 files changed, 34 insertions(+), 34 deletions(-) rename trunk/drivers/media/{dvb/frontends => common/tuners}/mt2060.c (100%) rename trunk/drivers/media/{dvb/frontends => common/tuners}/mt2060.h (100%) rename trunk/drivers/media/{dvb/frontends => common/tuners}/mt2060_priv.h (100%) rename trunk/drivers/media/{dvb/frontends => common/tuners}/mt2131.c (100%) rename trunk/drivers/media/{dvb/frontends => common/tuners}/mt2131.h (100%) rename trunk/drivers/media/{dvb/frontends => common/tuners}/mt2131_priv.h (100%) rename trunk/drivers/media/{dvb/frontends => common/tuners}/mt2266.c (100%) rename trunk/drivers/media/{dvb/frontends => common/tuners}/mt2266.h (100%) rename trunk/drivers/media/{dvb/frontends => common/tuners}/qt1010.c (100%) rename trunk/drivers/media/{dvb/frontends => common/tuners}/qt1010.h (100%) rename trunk/drivers/media/{dvb/frontends => common/tuners}/qt1010_priv.h (100%) diff --git a/[refs] b/[refs] index 12607543fec7..9afa6927973e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df7aaaf3a74016cbc72382b6388c7c62f3df49b2 +refs/heads/master: b094516f9589245617eb5d0452769826063f72ac diff --git a/trunk/drivers/media/common/tuners/Kconfig b/trunk/drivers/media/common/tuners/Kconfig index 9a6a9022e970..e6926e9fa332 100644 --- a/trunk/drivers/media/common/tuners/Kconfig +++ b/trunk/drivers/media/common/tuners/Kconfig @@ -99,6 +99,34 @@ config TUNER_MT20XX help Say Y here to include support for the MT2032 / MT2050 tuner. +config DVB_TUNER_MT2060 + tristate "Microtune MT2060 silicon IF tuner" + depends on I2C + default m if DVB_FE_CUSTOMISE + help + A driver for the silicon IF tuner MT2060 from Microtune. + +config DVB_TUNER_MT2266 + tristate "Microtune MT2266 silicon tuner" + depends on I2C + default m if DVB_FE_CUSTOMISE + help + A driver for the silicon baseband tuner MT2266 from Microtune. + +config DVB_TUNER_MT2131 + tristate "Microtune MT2131 silicon tuner" + depends on I2C + default m if DVB_FE_CUSTOMISE + help + A driver for the silicon baseband tuner MT2131 from Microtune. + +config DVB_TUNER_QT1010 + tristate "Quantek QT1010 silicon tuner" + depends on DVB_CORE && I2C + default m if DVB_FE_CUSTOMISE + help + A driver for the silicon tuner QT1010 from Quantek. + config TUNER_XC2028 tristate "XCeive xc2028/xc3028 tuners" depends on I2C && FW_LOADER diff --git a/trunk/drivers/media/common/tuners/Makefile b/trunk/drivers/media/common/tuners/Makefile index 685ae64fa3b8..812864312628 100644 --- a/trunk/drivers/media/common/tuners/Makefile +++ b/trunk/drivers/media/common/tuners/Makefile @@ -16,6 +16,10 @@ obj-$(CONFIG_TUNER_TDA9887) += tda9887.o obj-$(CONFIG_DVB_TDA827X) += tda827x.o obj-$(CONFIG_DVB_TDA18271) += tda18271.o obj-$(CONFIG_DVB_TUNER_XC5000) += xc5000.o +obj-$(CONFIG_DVB_TUNER_MT2060) += mt2060.o +obj-$(CONFIG_DVB_TUNER_MT2266) += mt2266.o +obj-$(CONFIG_DVB_TUNER_QT1010) += qt1010.o +obj-$(CONFIG_DVB_TUNER_MT2131) += mt2131.o EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core EXTRA_CFLAGS += -Idrivers/media/dvb/frontends diff --git a/trunk/drivers/media/dvb/frontends/mt2060.c b/trunk/drivers/media/common/tuners/mt2060.c similarity index 100% rename from trunk/drivers/media/dvb/frontends/mt2060.c rename to trunk/drivers/media/common/tuners/mt2060.c diff --git a/trunk/drivers/media/dvb/frontends/mt2060.h b/trunk/drivers/media/common/tuners/mt2060.h similarity index 100% rename from trunk/drivers/media/dvb/frontends/mt2060.h rename to trunk/drivers/media/common/tuners/mt2060.h diff --git a/trunk/drivers/media/dvb/frontends/mt2060_priv.h b/trunk/drivers/media/common/tuners/mt2060_priv.h similarity index 100% rename from trunk/drivers/media/dvb/frontends/mt2060_priv.h rename to trunk/drivers/media/common/tuners/mt2060_priv.h diff --git a/trunk/drivers/media/dvb/frontends/mt2131.c b/trunk/drivers/media/common/tuners/mt2131.c similarity index 100% rename from trunk/drivers/media/dvb/frontends/mt2131.c rename to trunk/drivers/media/common/tuners/mt2131.c diff --git a/trunk/drivers/media/dvb/frontends/mt2131.h b/trunk/drivers/media/common/tuners/mt2131.h similarity index 100% rename from trunk/drivers/media/dvb/frontends/mt2131.h rename to trunk/drivers/media/common/tuners/mt2131.h diff --git a/trunk/drivers/media/dvb/frontends/mt2131_priv.h b/trunk/drivers/media/common/tuners/mt2131_priv.h similarity index 100% rename from trunk/drivers/media/dvb/frontends/mt2131_priv.h rename to trunk/drivers/media/common/tuners/mt2131_priv.h diff --git a/trunk/drivers/media/dvb/frontends/mt2266.c b/trunk/drivers/media/common/tuners/mt2266.c similarity index 100% rename from trunk/drivers/media/dvb/frontends/mt2266.c rename to trunk/drivers/media/common/tuners/mt2266.c diff --git a/trunk/drivers/media/dvb/frontends/mt2266.h b/trunk/drivers/media/common/tuners/mt2266.h similarity index 100% rename from trunk/drivers/media/dvb/frontends/mt2266.h rename to trunk/drivers/media/common/tuners/mt2266.h diff --git a/trunk/drivers/media/dvb/frontends/qt1010.c b/trunk/drivers/media/common/tuners/qt1010.c similarity index 100% rename from trunk/drivers/media/dvb/frontends/qt1010.c rename to trunk/drivers/media/common/tuners/qt1010.c diff --git a/trunk/drivers/media/dvb/frontends/qt1010.h b/trunk/drivers/media/common/tuners/qt1010.h similarity index 100% rename from trunk/drivers/media/dvb/frontends/qt1010.h rename to trunk/drivers/media/common/tuners/qt1010.h diff --git a/trunk/drivers/media/dvb/frontends/qt1010_priv.h b/trunk/drivers/media/common/tuners/qt1010_priv.h similarity index 100% rename from trunk/drivers/media/dvb/frontends/qt1010_priv.h rename to trunk/drivers/media/common/tuners/qt1010_priv.h diff --git a/trunk/drivers/media/dvb/frontends/Kconfig b/trunk/drivers/media/dvb/frontends/Kconfig index 1486d96fd4b6..6d2384605927 100644 --- a/trunk/drivers/media/dvb/frontends/Kconfig +++ b/trunk/drivers/media/dvb/frontends/Kconfig @@ -336,7 +336,7 @@ config DVB_S5H1411 An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want to support this frontend. -comment "Tuners/PLL support" +comment "Digital terrestrial only tuners/PLL" depends on DVB_CORE config DVB_PLL @@ -347,34 +347,6 @@ config DVB_PLL This module drives a number of tuners based on PLL chips with a common I2C interface. Say Y when you want to support these tuners. -config DVB_TUNER_QT1010 - tristate "Quantek QT1010 silicon tuner" - depends on DVB_CORE && I2C - default m if DVB_FE_CUSTOMISE - help - A driver for the silicon tuner QT1010 from Quantek. - -config DVB_TUNER_MT2060 - tristate "Microtune MT2060 silicon IF tuner" - depends on I2C - default m if DVB_FE_CUSTOMISE - help - A driver for the silicon IF tuner MT2060 from Microtune. - -config DVB_TUNER_MT2266 - tristate "Microtune MT2266 silicon tuner" - depends on I2C - default m if DVB_FE_CUSTOMISE - help - A driver for the silicon baseband tuner MT2266 from Microtune. - -config DVB_TUNER_MT2131 - tristate "Microtune MT2131 silicon tuner" - depends on I2C - default m if DVB_FE_CUSTOMISE - help - A driver for the silicon baseband tuner MT2131 from Microtune. - config DVB_TUNER_DIB0070 tristate "DiBcom DiB0070 silicon base-band tuner" depends on I2C diff --git a/trunk/drivers/media/dvb/frontends/Makefile b/trunk/drivers/media/dvb/frontends/Makefile index 9b4438a13d0b..a89dc0fc4c6f 100644 --- a/trunk/drivers/media/dvb/frontends/Makefile +++ b/trunk/drivers/media/dvb/frontends/Makefile @@ -40,12 +40,8 @@ obj-$(CONFIG_DVB_ISL6405) += isl6405.o obj-$(CONFIG_DVB_ISL6421) += isl6421.o obj-$(CONFIG_DVB_TDA10086) += tda10086.o obj-$(CONFIG_DVB_TDA826X) += tda826x.o -obj-$(CONFIG_DVB_TUNER_MT2060) += mt2060.o -obj-$(CONFIG_DVB_TUNER_MT2266) += mt2266.o obj-$(CONFIG_DVB_TUNER_DIB0070) += dib0070.o -obj-$(CONFIG_DVB_TUNER_QT1010) += qt1010.o obj-$(CONFIG_DVB_TUA6100) += tua6100.o -obj-$(CONFIG_DVB_TUNER_MT2131) += mt2131.o obj-$(CONFIG_DVB_S5H1409) += s5h1409.o obj-$(CONFIG_DVB_TUNER_ITD1000) += itd1000.o obj-$(CONFIG_DVB_AU8522) += au8522.o