commit 9354f263383975ed5e11eb5a9cf21f2596f95be2
author Yunkang Tang <yunkang.tang@cn.alps.com> Tue Oct 15 23:50:38 2013 -0700
committer Dmitry Torokhov <dmitry.torokhov@gmail.com> Tue Oct 22 15:41:15 2013 -0700
tree aefc02c0eb5b9ace8f17f30f9169777cd8ad24ef
parent 57bcfce377d26f84d7b135512a4599f88b85ac52

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>

drivers/input/mouse/alps.c

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 7c5d72a..ca7a26f 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -1792,7 +1792,7 @@
 	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;