Skip to content

GitLab

Switch branch/tag
History Find file
Clone
Input: psmouse - fix build error of multiple definition
YueHaibing authored 
commit 49e6979e

 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: default avatarHulk Robot <hulkci@huawei.com>
Fixes: 55e3d922

 ("Input: psmouse - allow disabing certain protocol extensions")
Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
7d38923f
Name Last commit Last update
..
gameport Input: delete non-required instances of include <linux/init.h>
joystick Input: xpad - validate USB endpoint type during probe
keyboard Input: nomadik-ske-keypad - fix a loop timeout test
misc Input: uinput - add compat ioctl number translation for UI_*_FF_UPLOAD
mouse Input: psmouse - fix build error of multiple definition
serio Input: i8042 - add Lenovo LaVie Z to the i8042 reset list
tablet Input: gtco - bounds check collection indent level
touchscreen Input: mms114 - fix license module information
Kconfig Input: mousedev - allow disabling even without CONFIG_EXPERT
Makefile Input: matrix-keymap - uninline and prepare for device tree support
apm-power.c Input: random formatting fixes
evbug.c Input: use pr_fmt and pr_<level>
evdev.c Input: evdev - do not report errors form flush()
ff-core.c Input: uinput - avoid FF flush when destroying device
ff-memless.c Input: random formatting fixes
input-compat.c compat: Use COMPAT_USE_64BIT_TIME in the input subsystem
input-compat.h compat: Use COMPAT_USE_64BIT_TIME in the input subsystem
input-mt.c Input: MT - handle semi-mt devices in core
input-polldev.c Input: implement managed polled input devices
input.c Input: fix defuzzing logic
joydev.c Input: fix use-after-free introduced with dynamic minor changes
matrix-keymap.c input: Export matrix_keypad_parse_of_params()
mousedev.c Input: mousedev - fix race when creating mixed device
sparse-keymap.c treewide: Fix typo in Documentation/DocBook