diff options
| author | Yunkang Tang <yunkang.tang@cn.alps.com> | 2013-10-16 08:50:38 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-10-23 00:41:15 +0200 |
| commit | 9354f263383975ed5e11eb5a9cf21f2596f95be2 (patch) | |
| tree | aefc02c0eb5b9ace8f17f30f9169777cd8ad24ef /drivers/input | |
| parent | Input: wacom - not all multi-interface devices support touch (diff) | |
| download | linux-9354f263383975ed5e11eb5a9cf21f2596f95be2.tar.xz linux-9354f263383975ed5e11eb5a9cf21f2596f95be2.zip | |
Input: ALPS - change secondary device's name
Change the dev2's name from "PS/2 Mouse" to "ALPS PS/2 Device".
Signed-off-by: Yunkang Tang <yunkang.tang@cn.alps.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/mouse/alps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 7c5d72a6a26a..ca7a26f1dce8 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -1792,7 +1792,7 @@ int alps_init(struct psmouse *psmouse) snprintf(priv->phys, sizeof(priv->phys), "%s/input1", psmouse->ps2dev.serio->phys); dev2->phys = priv->phys; dev2->name = (priv->flags & ALPS_DUALPOINT) ? - "DualPoint Stick" : "PS/2 Mouse"; + "DualPoint Stick" : "ALPS PS/2 Device"; dev2->id.bustype = BUS_I8042; dev2->id.vendor = 0x0002; dev2->id.product = PSMOUSE_ALPS; |