diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
| commit | de2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch) | |
| tree | dfccb1a2717a8a042a87dbade509f894810ea1cd /drivers/input/input.c | |
| parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
| parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/input/input.c')
| -rw-r--r-- | drivers/input/input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index 3b1685ff9d10..1a1654caedd5 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c | |||
| @@ -730,7 +730,7 @@ static void input_register_classdevice(struct input_dev *dev) | |||
| 730 | "input%ld", (unsigned long) atomic_inc_return(&input_no) - 1); | 730 | "input%ld", (unsigned long) atomic_inc_return(&input_no) - 1); |
| 731 | 731 | ||
| 732 | path = kobject_get_path(&dev->cdev.class->subsys.kset.kobj, GFP_KERNEL); | 732 | path = kobject_get_path(&dev->cdev.class->subsys.kset.kobj, GFP_KERNEL); |
| 733 | printk(KERN_INFO "input: %s/%s as %s\n", | 733 | printk(KERN_INFO "input: %s as %s/%s\n", |
| 734 | dev->name ? dev->name : "Unspecified device", | 734 | dev->name ? dev->name : "Unspecified device", |
| 735 | path ? path : "", dev->cdev.class_id); | 735 | path ? path : "", dev->cdev.class_id); |
| 736 | kfree(path); | 736 | kfree(path); |