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

2 files changed, 6 insertions, 8 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);