diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 12:13:52 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 12:13:52 -0300 |
commit | baf2c601d974ae7d46859426c35fdae28a0e7033 (patch) | |
tree | d9d70a45831ed7a0dc5c0686fb16e1028bc19c5d /linux/drivers/media/video/dabusb.c | |
parent | d65762ce274a5e3cfe393763b41e518ec26a5974 (diff) | |
parent | 4c691e7dabc47811013c7266fa5f32fe96687c36 (diff) | |
download | mediapointer-dvb-s2-baf2c601d974ae7d46859426c35fdae28a0e7033.tar.gz mediapointer-dvb-s2-baf2c601d974ae7d46859426c35fdae28a0e7033.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/video/dabusb.c')
-rw-r--r-- | linux/drivers/media/video/dabusb.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linux/drivers/media/video/dabusb.c b/linux/drivers/media/video/dabusb.c index cb0a41c45..a0812ce91 100644 --- a/linux/drivers/media/video/dabusb.c +++ b/linux/drivers/media/video/dabusb.c @@ -813,8 +813,18 @@ static struct file_operations dabusb_fops = .release = dabusb_release, }; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) +static char *dabusb_nodename(struct device *dev) +{ + return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev)); +} + +#endif static struct usb_class_driver dabusb_class = { .name = "dabusb%d", +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) + .nodename = dabusb_nodename, +#endif .fops = &dabusb_fops, .minor_base = DABUSB_MINOR, }; |