diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-12 13:16:18 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-12 13:16:18 +0100 |
commit | f8cb22cbb8383c9f41e6ccbcd4fb94edb1048bda (patch) | |
tree | 9b3a333224ec895c053a694dcaff526502b84e6c /drivers/input/serio/gscps2.c | |
parent | 044d408409cc4e1bc75c886e27ca85c270db104c (diff) | |
parent | ebdcc81c71937b30e09110c02a1e8a21fa770b6f (diff) |
Merge branch 'linus' into irq/genirq
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 adc3bd6e7f7..bd0f92d9f40 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; |