diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-10 09:44:39 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-10 09:44:39 -0800 |
| commit | 67b738ef32df7ec429004866d2a739a3775894d2 (patch) | |
| tree | 5c67fa0cea6cc7298321480eda2df04bef795305 /drivers/input/serio | |
| parent | c451278c2864e253a4bb303b596a29edc3bb527c (diff) | |
| parent | 5d190c40100793a6dfc37bf325677c10f3c80edf (diff) | |
Merge branch 'devel-omap-irq' into omap-for-linus
Diffstat (limited to 'drivers/input/serio')
| -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 3c287dd879d..4225f5d6b15 100644 --- a/drivers/input/serio/gscps2.c +++ b/drivers/input/serio/gscps2.c @@ -358,7 +358,7 @@ static int __devinit gscps2_probe(struct parisc_device *dev) gscps2_reset(ps2port); ps2port->id = readb(ps2port->addr + GSC_ID) & 0x0f; - snprintf(serio->name, sizeof(serio->name), "GSC PS/2 %s", + snprintf(serio->name, sizeof(serio->name), "gsc-ps2-%s", (ps2port->id == GSC_ID_KEYBOARD) ? "keyboard" : "mouse"); strlcpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys)); serio->id.type = SERIO_8042; |