add cx24110 driver and remove LINUX_VERSION_CODE checks from regular code -

these belong to compat.h...

maybe we want to change the devfs_mk_dir() declaration to follow >2.5.66
semantics by default, but this would require a few more lines of code

4 files changed, 21 insertions, 12 deletions

diff --git a/linux/drivers/media/dvb/dvb-core/compat.h b/linux/drivers/media/dvb/dvb-core/compat.h
index 37207413b..4ab3ef8c4 100644
--- a/linux/drivers/media/dvb/dvb-core/compat.h
+++ b/linux/drivers/media/dvb/dvb-core/compat.h
@@ -125,5 +125,11 @@ extern struct page * vmalloc_to_page(void *addr);
 #define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)
 #endif
 
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,66))
+#define devfs_mk_dir(parent,name,info) devfs_mk_dir(name)
+#endif
+
+
 #endif
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c
index 235235aa6..e625b595d 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c
@@ -299,11 +299,7 @@ int dvb_register_adapter(struct dvb_adapter **padap, const char *name)
 	printk ("DVB: registering new adapter (%s).\n", name);
 	
 	snprintf(dirname, sizeof(dirname), "adapter%d", num);
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,66))
 	adap->devfs_handle = devfs_mk_dir(dvb_devfs_handle, dirname, NULL);
-#else
-	adap->devfs_handle = devfs_mk_dir(dirname);
-#endif
 	adap->num = num;
 	adap->name = name;
 
@@ -332,11 +328,7 @@ int dvb_unregister_adapter(struct dvb_adapter *adap)
 static
 int __init init_dvbdev(void)
 {
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,66))
 	dvb_devfs_handle = devfs_mk_dir (NULL, "dvb", NULL);
-#else
-	dvb_devfs_handle = devfs_mk_dir ("dvb");
-#endif
 #ifndef CONFIG_DVB_DEVFS_ONLY
 	if(register_chrdev(DVB_MAJOR,"DVB", &dvb_device_fops)) {
 		printk("video_dev: unable to get major %d\n", DVB_MAJOR);
diff --git a/linux/drivers/media/dvb/frontends/Kconfig b/linux/drivers/media/dvb/frontends/Kconfig
index e9c68eb93..49016aa1b 100644
--- a/linux/drivers/media/dvb/frontends/Kconfig
+++ b/linux/drivers/media/dvb/frontends/Kconfig
@@ -5,10 +5,9 @@ config DVB_STV0299
 	tristate "STV0299 based DVB-S frontend (QPSK)"
 	depends on DVB_CORE
 	help
-	  A DVB-S tuner module. 
-
-	  Say Y when you want to support frontend based on this 
-	  demodulator.
+	  The stv0299 by ST is used in many DVB-S tuner modules, 
+	  say Y when you want to support frontends based on this 
+	  DVB-S demodulator.
 
 	  Some examples are the Alps BSRU6, the Philips SU1278 and
 	  the LG TDQB-S00x.
@@ -63,6 +62,17 @@ config DVB_ATMEL_AT76C651
 	  DVB adapter simply enable all supported frontends, the
 	  right one will get autodetected.
 
+config DVB_CX24110
+	tristate "Frontends with Connexant CX24110 demodulator (QPSK)"
+	depends on DVB_CORE
+	help
+	  The CX24110 Demodulator is used in some DVB-S frontends. 
+	  Say Y if you want support for this chip in your kernel.
+
+	  If you don't know what tuner module is soldered on your 
+	  DVB adapter simply enable all supported frontends, the 
+	  right one will get autodetected.
+
 config DVB_GRUNDIG_29504_491
 	tristate "Grundig 29504-491 (QPSK)"
 	depends on DVB_CORE
diff --git a/linux/drivers/media/dvb/frontends/Makefile b/linux/drivers/media/dvb/frontends/Makefile
index d14464a20..bcc549541 100644
--- a/linux/drivers/media/dvb/frontends/Makefile
+++ b/linux/drivers/media/dvb/frontends/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_DVB_ALPS_BSRV2) += alps_bsrv2.o
 obj-$(CONFIG_DVB_ALPS_TDLB7) += alps_tdlb7.o
 obj-$(CONFIG_DVB_ALPS_TDMB7) += alps_tdmb7.o
 obj-$(CONFIG_DVB_ATMEL_AT76C651) += at76c651.o
+obj-$(CONFIG_DVB_CX24110) += cx24110.o
 obj-$(CONFIG_DVB_GRUNDIG_29504_491) += grundig_29504-491.o
 obj-$(CONFIG_DVB_GRUNDIG_29504_401) += grundig_29504-401.o
 obj-$(CONFIG_DVB_VES1820) += ves1820.o