| From 49e6979e7e92cf496105b5636f1df0ac17c159c0 Mon Sep 17 00:00:00 2001 |
| From: YueHaibing <yuehaibing@huawei.com> |
| Date: Tue, 16 Jul 2019 20:17:20 +0200 |
| Subject: Input: psmouse - fix build error of multiple definition |
| |
| From: YueHaibing <yuehaibing@huawei.com> |
| |
| commit 49e6979e7e92cf496105b5636f1df0ac17c159c0 upstream. |
| |
| trackpoint_detect() should be static inline while |
| CONFIG_MOUSE_PS2_TRACKPOINT is not set, otherwise, we build fails: |
| |
| drivers/input/mouse/alps.o: In function `trackpoint_detect': |
| alps.c:(.text+0x8e00): multiple definition of `trackpoint_detect' |
| drivers/input/mouse/psmouse-base.o:psmouse-base.c:(.text+0x1b50): first defined here |
| |
| Reported-by: Hulk Robot <hulkci@huawei.com> |
| Fixes: 55e3d9224b60 ("Input: psmouse - allow disabing certain protocol extensions") |
| Signed-off-by: YueHaibing <yuehaibing@huawei.com> |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| Cc: Hui Wang <hui.wang@canonical.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/input/mouse/trackpoint.h | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/input/mouse/trackpoint.h |
| +++ b/drivers/input/mouse/trackpoint.h |
| @@ -148,7 +148,8 @@ struct trackpoint_data |
| #ifdef CONFIG_MOUSE_PS2_TRACKPOINT |
| int trackpoint_detect(struct psmouse *psmouse, bool set_properties); |
| #else |
| -inline int trackpoint_detect(struct psmouse *psmouse, bool set_properties) |
| +static inline int trackpoint_detect(struct psmouse *psmouse, |
| + bool set_properties) |
| { |
| return -ENOSYS; |
| } |
