---

yaml --- r: 113947 b: refs/heads/master c: 0d46748 h: refs/heads/master i: 113945: e0b2f0f 113943: 863ea40 v: v3
git-mirror · Oct 12, 2008 · ff2d1ab · ff2d1ab
1 parent eebdcd5
commit ff2d1ab
Show file tree

Hide file tree

Showing 5 changed files with 1,009 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b73eeafbc856c0cef7166242f0e55403407f355
+refs/heads/master: 0d46748c3f874defbbbf98bcf40c7b18964abbc0
diff --git a/trunk/drivers/media/dvb/frontends/Kconfig b/trunk/drivers/media/dvb/frontends/Kconfig
@@ -92,6 +92,13 @@ config DVB_TUA6100
 	help
 	  A DVB-S PLL chip.
 
+config DVB_CX24116
+	tristate "Conexant CX24116 based"
+	depends on DVB_CORE && I2C
+	default m if DVB_FE_CUSTOMISE
+	help
+	  A DVB-S/S2 tuner module. Say Y when you want to support this frontend.
+
 comment "DVB-T (terrestrial) frontends"
 	depends on DVB_CORE
 

diff --git a/trunk/drivers/media/dvb/frontends/Makefile b/trunk/drivers/media/dvb/frontends/Makefile
@@ -51,3 +51,4 @@ obj-$(CONFIG_DVB_S5H1411) += s5h1411.o
 obj-$(CONFIG_DVB_LGS8GL5) += lgs8gl5.o
 obj-$(CONFIG_DVB_DUMMY_FE) += dvb_dummy_fe.o
 obj-$(CONFIG_DVB_AF9013) += af9013.o
+obj-$(CONFIG_DVB_CX24116) += cx24116.o