[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20131030114624.GY5442@type.youpi.perso.aquilenet.fr>
Date: Wed, 30 Oct 2013 12:46:24 +0100
From: Samuel Thibault <samuel.thibault@...-lyon.org>
To: Randy Dunlap <rdunlap@...radead.org>
Cc: akpm@...ux-foundation.org, linux-kernel@...r.kernel.org,
linux-next@...r.kernel.org
Subject: [PATCH] Fix build without CONFIG_INPUT_LEDS [Was: mmotm
2013-10-29-16-22 uploaded (input)]
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@...-lyon.org>
--- include/linux/input.h.orig 2013-10-30 12:42:41.169038670 +0100
+++ include/linux/input.h 2013-10-30 12:42:42.908987157 +0100
@@ -540,12 +540,12 @@
#else
-int input_led_connect(struct input_dev *dev)
+static inline int input_led_connect(struct input_dev *dev)
{
return 0;
}
-void input_led_disconnect(struct input_dev *dev)
+static inline void input_led_disconnect(struct input_dev *dev)
{
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists