diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 20:04:56 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 20:04:56 -0200 |
commit | 7af33dc182a51e3feda1246207c939d8459dbd61 (patch) | |
tree | 81416520e5321725fa97909e5652ed7c87598893 /linux/drivers/media/dvb/dvb-core | |
parent | 1272389ee0a46d702d0dc471d791b9fae7668aed (diff) | |
parent | b4efb4ebbf8e3e7d3d0230bf4a811f7dafeef9a0 (diff) | |
download | mediapointer-dvb-s2-7af33dc182a51e3feda1246207c939d8459dbd61.tar.gz mediapointer-dvb-s2-7af33dc182a51e3feda1246207c939d8459dbd61.tar.bz2 |
merge: http://linuxtv.org/hg/~anttip/af9015
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core')
-rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvbdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c index 7348f8ead..fa1adf9dd 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.c +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c @@ -261,7 +261,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27) clsdev = device_create(dvb_class, adap->device, - MKDEV(DVB_MAJOR, minor, + MKDEV(DVB_MAJOR, minor), dvbdev, "dvb%d.%s%d", adap->num, dnames[type], id); #elif LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 27) clsdev = device_create_drvdata(dvb_class, adap->device, |