diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-09 00:30:55 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-09 00:30:55 +0100 |
| commit | d15c22e78674f9a5bc0de0932a43abe1aafae303 (patch) | |
| tree | 3e4198c44bd2d9184e91647346c66aa95e28f843 /drivers/input/serio/gscps2.c | |
| parent | Input: psmouse - add newline to OLPC HGPK touchpad debugging (diff) | |
| parent | Linux 2.6.29-rc7 (diff) | |
| download | linux-d15c22e78674f9a5bc0de0932a43abe1aafae303.tar.xz linux-d15c22e78674f9a5bc0de0932a43abe1aafae303.zip | |
Merge commit 'v2.6.29-rc7' into next
Diffstat (limited to 'drivers/input/serio/gscps2.c')
| -rw-r--r-- | drivers/input/serio/gscps2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c index adc3bd6e7f7b..bd0f92d9f40f 100644 --- a/drivers/input/serio/gscps2.c +++ b/drivers/input/serio/gscps2.c @@ -359,7 +359,7 @@ static int __init gscps2_probe(struct parisc_device *dev) snprintf(serio->name, sizeof(serio->name), "GSC PS/2 %s", (ps2port->id == GSC_ID_KEYBOARD) ? "keyboard" : "mouse"); - strlcpy(serio->phys, dev->dev.bus_id, sizeof(serio->phys)); + strlcpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys)); serio->id.type = SERIO_8042; serio->write = gscps2_write; serio->open = gscps2_open; |