Move other terrestrial tuners to common/tuners

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Those tuners are currently used only under media/dvb. However,
they can support also analog TV. Better to move them to the same place
as the other hybrid tuners. This would make easier to use those tuners also
by analog drivers.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

13 files changed, 1 insertions, 33 deletions

diff --git a/linux/drivers/media/dvb/frontends/mt2060.c b/linux/drivers/media/common/tuners/mt2060.c
index 355817754..355817754 100644
--- a/linux/drivers/media/dvb/frontends/mt2060.c
+++ b/linux/drivers/media/common/tuners/mt2060.c
diff --git a/linux/drivers/media/dvb/frontends/mt2060.h b/linux/drivers/media/common/tuners/mt2060.h
index acba0058f..acba0058f 100644
--- a/linux/drivers/media/dvb/frontends/mt2060.h
+++ b/linux/drivers/media/common/tuners/mt2060.h
diff --git a/linux/drivers/media/dvb/frontends/mt2060_priv.h b/linux/drivers/media/common/tuners/mt2060_priv.h
index 5eaccdefd..5eaccdefd 100644
--- a/linux/drivers/media/dvb/frontends/mt2060_priv.h
+++ b/linux/drivers/media/common/tuners/mt2060_priv.h
diff --git a/linux/drivers/media/dvb/frontends/mt2131.c b/linux/drivers/media/common/tuners/mt2131.c
index becc409d9..becc409d9 100644
--- a/linux/drivers/media/dvb/frontends/mt2131.c
+++ b/linux/drivers/media/common/tuners/mt2131.c
diff --git a/linux/drivers/media/dvb/frontends/mt2131.h b/linux/drivers/media/common/tuners/mt2131.h
index 606d8576b..606d8576b 100644
--- a/linux/drivers/media/dvb/frontends/mt2131.h
+++ b/linux/drivers/media/common/tuners/mt2131.h
diff --git a/linux/drivers/media/dvb/frontends/mt2131_priv.h b/linux/drivers/media/common/tuners/mt2131_priv.h
index e930759c2..e930759c2 100644
--- a/linux/drivers/media/dvb/frontends/mt2131_priv.h
+++ b/linux/drivers/media/common/tuners/mt2131_priv.h
diff --git a/linux/drivers/media/dvb/frontends/mt2266.c b/linux/drivers/media/common/tuners/mt2266.c
index 9927a1a55..9927a1a55 100644
--- a/linux/drivers/media/dvb/frontends/mt2266.c
+++ b/linux/drivers/media/common/tuners/mt2266.c
diff --git a/linux/drivers/media/dvb/frontends/mt2266.h b/linux/drivers/media/common/tuners/mt2266.h
index c5113efe3..c5113efe3 100644
--- a/linux/drivers/media/dvb/frontends/mt2266.h
+++ b/linux/drivers/media/common/tuners/mt2266.h
diff --git a/linux/drivers/media/dvb/frontends/qt1010.c b/linux/drivers/media/common/tuners/qt1010.c
index 4afed44ab..4afed44ab 100644
--- a/linux/drivers/media/dvb/frontends/qt1010.c
+++ b/linux/drivers/media/common/tuners/qt1010.c
diff --git a/linux/drivers/media/dvb/frontends/qt1010.h b/linux/drivers/media/common/tuners/qt1010.h
index cff6a7ca5..cff6a7ca5 100644
--- a/linux/drivers/media/dvb/frontends/qt1010.h
+++ b/linux/drivers/media/common/tuners/qt1010.h
diff --git a/linux/drivers/media/dvb/frontends/qt1010_priv.h b/linux/drivers/media/common/tuners/qt1010_priv.h
index 090cf475f..090cf475f 100644
--- a/linux/drivers/media/dvb/frontends/qt1010_priv.h
+++ b/linux/drivers/media/common/tuners/qt1010_priv.h
diff --git a/linux/drivers/media/dvb/frontends/Kconfig b/linux/drivers/media/dvb/frontends/Kconfig
index e62816870..93d0ecb16 100644
--- a/linux/drivers/media/dvb/frontends/Kconfig
+++ b/linux/drivers/media/dvb/frontends/Kconfig
@@ -350,7 +350,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
@@ -361,34 +361,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/linux/drivers/media/dvb/frontends/Makefile b/linux/drivers/media/dvb/frontends/Makefile
index 62c6e2a31..028da5561 100644
--- a/linux/drivers/media/dvb/frontends/Makefile
+++ b/linux/drivers/media/dvb/frontends/Makefile
@@ -41,12 +41,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