summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYueHaibing <yuehaibing@huawei.com>2019-07-16 20:17:20 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-08-25 10:53:03 +0200
commit4f68628e9f0585e87d1f92e20ac664ab10360ab6 (patch)
tree4c96d488e136c9db76b4cf26fc9aa3adefcec74e /include
parent2b90ebda8518042332bb3ee7be4d642378999cf1 (diff)
Input: psmouse - fix build error of multiple definition
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>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions