---

yaml --- r: 124026 b: refs/heads/master c: 040dcc3 h: refs/heads/master v: v3
git-mirror · Dec 29, 2008 · a27a208 · a27a208
1 parent 18bafda
commit a27a208
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c46b65621007a2ede49464d227f64dd3a909a109
+refs/heads/master: 040dcc3e5194d0170727adc5df213cfe9d994302
diff --git a/trunk/drivers/media/dvb/frontends/Kconfig b/trunk/drivers/media/dvb/frontends/Kconfig
@@ -22,6 +22,13 @@ config DVB_STB0899
 	  A DVB-S/S2/DSS Multistandard demodulator. Say Y when you want
 	  to support this demodulator based frontends
 
+config DVB_STB6100
+	tristate "STB6100 based tuners"
+	depends on DVB_CORE
+	help
+	  A Silicon tuner from ST used in conjunction with the STB0899
+	  demodulator. Say Y when you want to support this tuner.
+
 comment "DVB-S (satellite) frontends"
 	depends on DVB_CORE
 

diff --git a/trunk/drivers/media/dvb/frontends/Makefile b/trunk/drivers/media/dvb/frontends/Makefile
@@ -11,6 +11,7 @@ stb0899-objs = stb0899_drv.o stb0899_algo.o
 obj-$(CONFIG_DVB_PLL) += dvb-pll.o
 obj-$(CONFIG_DVB_STV0299) += stv0299.o
 obj-$(CONFIG_DVB_STB0899) += stb0899.o
+obj-$(CONFIG_DVB_STB6100) += stb6100.o
 obj-$(CONFIG_DVB_SP8870) += sp8870.o
 obj-$(CONFIG_DVB_CX22700) += cx22700.o
 obj-$(CONFIG_DVB_CX24110) += cx24110.o