lkml.org 
[lkml]   [2013]   [Oct]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] Fix build without CONFIG_INPUT_LEDS [Was: mmotm 2013-10-29-16-22 uploaded (input)]
On Thu, 31 Oct 2013 10:20:12 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
>
> On Wed, 30 Oct 2013 12:46:24 +0100 Samuel Thibault <samuel.thibault@ens-lyon.org> 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@ens-lyon.org>
>
> I have added that as a fix patch for the akpm-current tree for today.

It needs this as well.

From: Andrew Morton <akpm@linux-foundation.org>
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@gmail.com>
Cc: John Crispin <blogic@openwrt.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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);
_


\
 
 \ /
  Last update: 2013-10-31 00:41    [W:0.041 / U:0.544 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site