[linux-dvb] CVS and 2.6.13-rc1 don't compil

[syphir at syphir.sytes.net (C.Y.M)]

Gregoire Favre wrote:
> On Thu, Jun 30, 2005 at 11:34:23AM -0700, C.Y.M wrote:
> 
> 
>>Try this...
> 
> 
> Don't seem to fix it _
> 

Sorry, I forgot this one too.

Regards,
C.

-------------- next part --------------
--- linux/drivers/media/dvb/dvb-core/dvbdev.c.orig	2005-06-30 11:59:07.000000000 -0700
+++ linux/drivers/media/dvb/dvb-core/dvbdev.c	2005-06-30 12:07:13.000000000 -0700
@@ -235,7 +235,11 @@
 			S_IFCHR | S_IRUSR | S_IWUSR,
 			"dvb/adapter%d/%s%d", adap->num, dnames[type], id);
 
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
+	class_device_create(dvb_class, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)),
+#else
 	class_simple_device_add(dvb_class, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)),
+#endif
 				NULL, "dvb%d.%s%d", adap->num, dnames[type], id);
 
 	dprintk("DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n",
@@ -255,7 +259,11 @@
 	devfs_remove("dvb/adapter%d/%s%d", dvbdev->adapter->num,
 			dnames[dvbdev->type], dvbdev->id);
 
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
+	class_device_destroy(dvb_class, MKDEV(DVB_MAJOR, nums2minor(dvbdev->adapter->num,
+#else	
 	class_simple_device_remove(MKDEV(DVB_MAJOR, nums2minor(dvbdev->adapter->num,
+#endif
 					dvbdev->type, dvbdev->id)));
 
 	list_del (&dvbdev->list_head);
@@ -411,7 +419,11 @@
 
 	devfs_mk_dir("dvb");
 
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
+	dvb_class = class_create(THIS_MODULE, "dvb");
+#else
 	dvb_class = class_simple_create(THIS_MODULE, "dvb");
+#endif
 	if (IS_ERR(dvb_class)) {
 		retval = PTR_ERR(dvb_class);
 		goto error;
@@ -428,7 +440,11 @@
 static void __exit exit_dvbdev(void)
 {
         devfs_remove("dvb");
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
+	class_destroy(dvb_class);
+#else
 	class_simple_destroy(dvb_class);
+#endif
 	cdev_del(&dvb_device_cdev);
         unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS);
 }