diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-12-18 02:25:10 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-12-18 02:25:10 +0300 |
| commit | f01c5e652ca949722a7fe4cfdecd73e8026971d2 (patch) | |
| tree | 95ccc81f76a685e1e3462fd8555e96156b83993a /drivers/input/mouse/logips2pp.c | |
| parent | 40e3be3933aee185fd6ab1ec87dfaf3502d9f5b3 (diff) | |
| parent | 190e2031e2db542094659cfa55bfc28545458df5 (diff) | |
| download | linux-f01c5e652ca949722a7fe4cfdecd73e8026971d2.tar.xz | |
Merge branch 'psmouse-passthrough' into next
Bring in changes to limit number of protocols we try on pass-though PS/2
ports so that probe ocmpletes faster.
Diffstat (limited to 'drivers/input/mouse/logips2pp.c')
| -rw-r--r-- | drivers/input/mouse/logips2pp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c index 136e222e2a16..422da1cd9e76 100644 --- a/drivers/input/mouse/logips2pp.c +++ b/drivers/input/mouse/logips2pp.c @@ -325,7 +325,7 @@ static void ps2pp_set_model_properties(struct psmouse *psmouse, * that support it. */ -int ps2pp_init(struct psmouse *psmouse, bool set_properties) +int ps2pp_detect(struct psmouse *psmouse, bool set_properties) { struct ps2dev *ps2dev = &psmouse->ps2dev; unsigned char param[4]; |