diff --git a/[refs] b/[refs] index b6f20e0dfd03..9dcfa3eca66f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7972720aaa044d0bca40e2e1d4c176076a9f0e00 +refs/heads/master: 995fc4df0bc8d88417742e4b1d17889fc64b6ef3 diff --git a/trunk/drivers/input/input.c b/trunk/drivers/input/input.c index 3b1685ff9d10..1a1654caedd5 100644 --- a/trunk/drivers/input/input.c +++ b/trunk/drivers/input/input.c @@ -730,7 +730,7 @@ static void input_register_classdevice(struct input_dev *dev) "input%ld", (unsigned long) atomic_inc_return(&input_no) - 1); path = kobject_get_path(&dev->cdev.class->subsys.kset.kobj, GFP_KERNEL); - printk(KERN_INFO "input: %s/%s as %s\n", + printk(KERN_INFO "input: %s as %s/%s\n", dev->name ? dev->name : "Unspecified device", path ? path : "", dev->cdev.class_id); kfree(path);