From: Andrew Morton <akpm@linux-foundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>,
Randy Dunlap <rdunlap@infradead.org>,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org
Subject: Re: [PATCH] Fix build without CONFIG_INPUT_LEDS [Was: mmotm 2013-10-29-16-22 uploaded (input)]
Date: Wed, 30 Oct 2013 16:23:34 -0700 [thread overview]
Message-ID: <20131030162334.f4d14c0b1b135cb38dce5dfb@linux-foundation.org> (raw)
In-Reply-To: <20131031102012.599a7a256c48feed7832a208@canb.auug.org.au>
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);
_
next prev parent reply other threads:[~2013-10-30 23:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-29 23:23 mmotm 2013-10-29-16-22 uploaded akpm
2013-10-30 1:57 ` mmotm 2013-10-29-16-22 uploaded (input) Randy Dunlap
2013-10-30 11:46 ` [PATCH] Fix build without CONFIG_INPUT_LEDS [Was: mmotm 2013-10-29-16-22 uploaded (input)] Samuel Thibault
2013-10-30 18:12 ` Randy Dunlap
2013-10-30 23:20 ` Stephen Rothwell
2013-10-30 23:23 ` Andrew Morton [this message]
2013-10-30 23:27 ` Stephen Rothwell
2013-10-30 18:09 ` mmotm 2013-10-29-16-22 uploaded (dm-flakey.c) Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131030162334.f4d14c0b1b135cb38dce5dfb@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rdunlap@infradead.org \
--cc=samuel.thibault@ens-lyon.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).