Messages in this thread | | | Date | Tue, 16 Jul 2019 20:19:04 +0200 | From | Dmitry Torokhov <> | Subject | Re: [PATCH] Input: psmouse - Fix build error of multiple definition |
| |
On Tue, Jul 16, 2019 at 02:54:11PM +0800, YueHaibing wrote: > 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 <hulkci@huawei.com> > Fixes: 55e3d9224b60 ("Input: psmouse - allow disabing certain protocol extensions") > Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Applied, thank you.
> --- > 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 > >
-- Dmitry
| |