diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-26 06:28:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-26 06:28:54 -0300 |
| commit | 1f6dd4663794254732f38f41136d3b480dbabc59 (patch) | |
| tree | b244e81e4cfb89eb32e96d5bfabd4af26cc3a61f /linux/drivers/media/dvb/dvb-core/dvbdev.c | |
| parent | 8ee417ab6882e4c478e95c6f0198efe416ee5da8 (diff) | |
| parent | d1c3ce25c000fa72c7bfb3b42d88bfbe4f5e37fa (diff) | |
| download | mediapointer-dvb-s2-1f6dd4663794254732f38f41136d3b480dbabc59.tar.gz mediapointer-dvb-s2-1f6dd4663794254732f38f41136d3b480dbabc59.tar.bz2 | |
merge: http://linuxtv.org/hg/~hgoede/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core/dvbdev.c')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvbdev.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c index e6d20310a..0820da504 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.c +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c @@ -242,9 +242,15 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, mutex_unlock(&dvbdev_register_lock); +#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 26) + clsdev = device_create_drvdata(dvb_class, adap->device, + MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)), + NULL, "dvb%d.%s%d", adap->num, dnames[type], id); +#else clsdev = device_create(dvb_class, adap->device, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)), "dvb%d.%s%d", adap->num, dnames[type], id); +#endif if (IS_ERR(clsdev)) { printk(KERN_ERR "%s: failed to create device dvb%d.%s%d (%ld)\n", __func__, adap->num, dnames[type], id, PTR_ERR(clsdev)); |