On Thu, 31 Oct 2013 10:20:12 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Hi all, > > On Wed, 30 Oct 2013 12:46:24 +0100 Samuel Thibault <samuel.thibault@xxxxxxxxxxxx> wrote: > > > > Randy Dunlap, le Tue 29 Oct 2013 18:57:36 -0700, a __crit : > > > arc_ps2.c:(.text+0x500): multiple definition of `input_led_connect' > > > > D'oh. I indeed hadn't tested the inlines, sorry about this. > > > > Andrew, could you add the following patch on top of > > input-route-kbd-leds-through-the-generic-leds-layer.patch > > or perhaps rather fold into it? > > > > Samuel > > > > > > > > Really mark inlines as static inlines, so they are not defined multiple > > times. > > > > Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx> > > I have added that as a fix patch for the akpm-current tree for today. It needs this as well. From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: input-route-kbd-leds-through-the-generic-leds-layer-fix-fix use IS_ENABLED to pick up CONFIG_INPUT_LEDS=m Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> Cc: John Crispin <blogic@xxxxxxxxxxx> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/input.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN include/linux/input.h~input-route-kbd-leds-through-the-generic-leds-layer-fix-fix include/linux/input.h --- a/include/linux/input.h~input-route-kbd-leds-through-the-generic-leds-layer-fix-fix +++ a/include/linux/input.h @@ -533,7 +533,7 @@ int input_ff_erase(struct input_dev *dev int input_ff_create_memless(struct input_dev *dev, void *data, int (*play_effect)(struct input_dev *, void *, struct ff_effect *)); -#ifdef CONFIG_INPUT_LEDS +#if IS_ENABLED(CONFIG_INPUT_LEDS) int input_led_connect(struct input_dev *dev); void input_led_disconnect(struct input_dev *dev); _ -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
