Patchwork [3.5.y.z,extended,stable] Patch "Input: matrix-keymap - provide proper module license" has been added to staging queue

mail settings
Submitter Herton Ronaldo Krzesinski
Date Dec. 13, 2012, 4:46 a.m.
Message ID <>
Download mbox | patch
Permalink /patch/205739/
State New
Headers show


Herton Ronaldo Krzesinski - Dec. 13, 2012, 4:46 a.m.
This is a note to let you know that I have just added a patch titled

    Input: matrix-keymap - provide proper module license

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see



From 7760add8254ceb50b06c5dacb0e39b3b30aed880 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <>
Date: Mon, 10 Dec 2012 12:25:32 -0800
Subject: [PATCH 20/20] Input: matrix-keymap - provide proper module license

commit 55220bb3e5f917dd5fee1153c612f9a83599f639 upstream.

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 1932811f426f ("Input: matrix-keymap
- uninline and prepare for device tree support")

Signed-off-by: Florian Fainelli <>
Signed-off-by: Dmitry Torokhov <>
Signed-off-by: Linus Torvalds <>
Signed-off-by: Herton Ronaldo Krzesinski <>
 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;