diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-26 06:41:37 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-26 06:41:37 -0300 |
| commit | dbe96ea057cb7cf8050f22c934df078560d88c65 (patch) | |
| tree | c3bcb1a051272ee414836c3186f1fb67c206edb9 /linux/drivers/media/dvb/dvb-core/dvbdev.c | |
| parent | c241933ee2723ed8ac2f3e493a3abfa9a8aa35fa (diff) | |
| parent | dd206111ac475d3fe5b1da56cfd0b54544ab0591 (diff) | |
| download | mediapointer-dvb-s2-dbe96ea057cb7cf8050f22c934df078560d88c65.tar.gz mediapointer-dvb-s2-dbe96ea057cb7cf8050f22c934df078560d88c65.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-audiochip
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)); |