diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-07-26 12:07:15 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-07-26 12:07:15 -0700 |
| commit | 0808882863774ab69066d83f49f511606be024e0 (patch) | |
| tree | dc5eaab5db6c18e06025356235b0c9ba02bd7a1d /drivers/input/mouse/elantech.c | |
| parent | e9003c9cfaa17d26991688268b04244adb67ee2b (diff) | |
| parent | 0097ff3d5dad1f76c5e1099d849d52509500708c (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.8 merge window.
Diffstat (limited to 'drivers/input/mouse/elantech.c')
| -rw-r--r-- | drivers/input/mouse/elantech.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index be5b399da5d3..615d23ec0d8e 100644 --- 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; |