Merge branch 'for-linus' into next

[cascardo/linux.git] / drivers / input / mouse / elantech.c

diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index be5b399..615d23e 100644 (file)
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1708,7 +1708,7 @@ int elantech_init(struct psmouse *psmouse)
                snprintf(etd->tp_phys, sizeof(etd->tp_phys), "%s/input1",
                        psmouse->ps2dev.serio->phys);
                tp_dev->phys = etd->tp_phys;
-               tp_dev->name = "Elantech PS/2 TrackPoint";
+               tp_dev->name = "ETPS/2 Elantech TrackPoint";
                tp_dev->id.bustype = BUS_I8042;
                tp_dev->id.vendor  = 0x0002;
                tp_dev->id.product = PSMOUSE_ELANTECH;