summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorYunkang Tang <yunkang.tang@cn.alps.com>2013-10-15 23:50:38 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-10-22 15:41:15 -0700
commit9354f263383975ed5e11eb5a9cf21f2596f95be2 (patch)
treeaefc02c0eb5b9ace8f17f30f9169777cd8ad24ef /drivers/input
parent57bcfce377d26f84d7b135512a4599f88b85ac52 (diff)
downloadlinux-9354f263383975ed5e11eb5a9cf21f2596f95be2.tar.bz2
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.c2
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;