public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Input: matrix-keymap - provide proper module license
@ 2012-12-10 20:25 Dmitry Torokhov
  2012-12-10 20:41 ` Florian Fainelli
  0 siblings, 1 reply; 2+ messages in thread
From: Dmitry Torokhov @ 2012-12-10 20:25 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Florian Fainelli, Andrew Morton, linux-kernel

From: Florian Fainelli <florian@openwrt.org>

The matrix-keymap module is currently lacking a proper module license,
add one so we don't have this module tainting the entire kernel. This
issue has been present since commit 1932811f (Input: matrix-keymap -
uninline and prepare for device tree support)

Signed-off-by: Florian Fainelli <florian@openwrt.org>
CC: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---

Hi Linus,

Please apply before 3.8 final if possible. Sending directly as my normal
branch has some extra stuff in it...

Thanks,
Dmitry


 drivers/input/matrix-keymap.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/input/matrix-keymap.c b/drivers/input/matrix-keymap.c
index 443ad64b..d88d9be 100644
--- a/drivers/input/matrix-keymap.c
+++ b/drivers/input/matrix-keymap.c
@@ -23,6 +23,7 @@
 #include <linux/input.h>
 #include <linux/of.h>
 #include <linux/export.h>
+#include <linux/module.h>
 #include <linux/input/matrix_keypad.h>
 
 static bool matrix_keypad_map_key(struct input_dev *input_dev,
@@ -161,3 +162,5 @@ int matrix_keypad_build_keymap(const struct matrix_keymap_data *keymap_data,
 	return 0;
 }
 EXPORT_SYMBOL(matrix_keypad_build_keymap);
+
+MODULE_LICENSE("GPL");
-- 
1.7.11.7


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Input: matrix-keymap - provide proper module license
  2012-12-10 20:25 [PATCH] Input: matrix-keymap - provide proper module license Dmitry Torokhov
@ 2012-12-10 20:41 ` Florian Fainelli
  0 siblings, 0 replies; 2+ messages in thread
From: Florian Fainelli @ 2012-12-10 20:41 UTC (permalink / raw)
  To: Dmitry Torokhov; +Cc: Linus Torvalds, Andrew Morton, linux-kernel, gregkh

On Monday 10 December 2012 12:25:32 Dmitry Torokhov wrote:
> From: Florian Fainelli <florian@openwrt.org>
> 
> The matrix-keymap module is currently lacking a proper module license,
> add one so we don't have this module tainting the entire kernel. This
> issue has been present since commit 1932811f (Input: matrix-keymap -
> uninline and prepare for device tree support)
> 
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
> CC: stable@vger.kernel.org
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
> 
> Hi Linus,
> 
> Please apply before 3.8 final if possible. Sending directly as my normal
> branch has some extra stuff in it...

Thank you Dmitry! In fact, this issue has been present since 3.5, so it might
be worth backporting this fix to -stable tree as well.
-- 
Florian

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-12-10 20:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-10 20:25 [PATCH] Input: matrix-keymap - provide proper module license Dmitry Torokhov
2012-12-10 20:41 ` Florian Fainelli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox