Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / media / video / dabusb.c

diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c
index ba3709b..0664d11 100644 (file)
--- a/drivers/media/video/dabusb.c
+++ b/drivers/media/video/dabusb.c
@@ -32,6 +32,7 @@
 #include <linux/list.h>
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
@@ -747,8 +748,14 @@ static const struct file_operations dabusb_fops =
        .release =      dabusb_release,
 };
 
+static char *dabusb_nodename(struct device *dev)
+{
+       return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev));
+}
+
 static struct usb_class_driver dabusb_class = {
        .name =         "dabusb%d",
+       .nodename =     dabusb_nodename,
        .fops =         &dabusb_fops,
        .minor_base =   DABUSB_MINOR,
 };