]> git.itanic.dy.fi Git - linux-stable/commit
Input: psmouse - fix build error of multiple definition
authorYueHaibing <yuehaibing@huawei.com>
Tue, 16 Jul 2019 18:17:20 +0000 (20:17 +0200)
committerSasha Levin <sashal@kernel.org>
Sun, 25 Aug 2019 14:10:36 +0000 (10:10 -0400)
commite8904e5e4d43a297afc6a3e7c8881fda2039614c
treed1457bed71ebf166b32389dc51da4cb32568c483
parent825169c942396de176858fddbda22fbc8bb42f10
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>
drivers/input/mouse/trackpoint.h