From mboxrd@z Thu Jan 1 00:00:00 1970 From: YueHaibing Subject: [PATCH] Input: psmouse - Fix build error of multiple definition Date: Tue, 16 Jul 2019 14:54:11 +0800 Message-ID: <20190716065411.56780-1-yuehaibing@huawei.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Sender: linux-kernel-owner@vger.kernel.org To: dmitry.torokhov@gmail.com, allison@lohutok.net, tglx@linutronix.de, info@metux.net, dilinger@debian.org Cc: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, YueHaibing List-Id: linux-input@vger.kernel.org trackpoint_detect() should be static inline while CONFIG_MOUSE_PS2_TRACKPOINT is not set. otherwire,we got building 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 Fixes: 55e3d9224b60 ("Input: psmouse - allow disabing certain protocol extensions") Signed-off-by: YueHaibing --- drivers/input/mouse/trackpoint.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h index 0afffe8..77110f3 100644 --- a/drivers/input/mouse/trackpoint.h +++ b/drivers/input/mouse/trackpoint.h @@ -158,7 +158,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; } -- 2.7.4