diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-12-17 23:25:10 (GMT) |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-12-17 23:25:10 (GMT) |
| commit | f01c5e652ca949722a7fe4cfdecd73e8026971d2 (patch) | |
| tree | 95ccc81f76a685e1e3462fd8555e96156b83993a /drivers/input/mouse/focaltech.h | |
| 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/focaltech.h')
| -rw-r--r-- | drivers/input/mouse/focaltech.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/input/mouse/focaltech.h b/drivers/input/mouse/focaltech.h index ca61ebf..783b28e 100644 --- a/drivers/input/mouse/focaltech.h +++ b/drivers/input/mouse/focaltech.h @@ -18,6 +18,14 @@ #define _FOCALTECH_H int focaltech_detect(struct psmouse *psmouse, bool set_properties); + +#ifdef CONFIG_MOUSE_PS2_FOCALTECH int focaltech_init(struct psmouse *psmouse); +#else +static inline int focaltech_init(struct psmouse *psmouse) +{ + return -ENOSYS; +} +#endif #endif |