]> git.baikalelectronics.ru Git - kernel.git/commit
Input: psmouse - fix build error of multiple definition
authorYueHaibing <yuehaibing@huawei.com>
Tue, 16 Jul 2019 18:17:20 +0000 (20:17 +0200)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 19 Jul 2019 08:58:50 +0000 (11:58 +0300)
commitb9a52563992467945ce221b76c9113151985c960
tree587bfe14604913d3fde5400b686d5d1fd40658e4
parent215cbe3b229225603bd78c73a52b97b2e316bfaa
Input: psmouse - fix build error of multiple definition

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: a93b890e94e5 ("Input: psmouse - allow disabing certain protocol extensions")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/mouse/trackpoint.h