40230427876935c49b181df4da54ab2d9ddcdd0e
[openwrt/staging/pepe2k.git] / target / linux / generic / patches-3.6 / 067-input_keymap_module_license.patch
1 From 07b9a6cde27d690ea3331fc2ca2778902d929aaa Mon Sep 17 00:00:00 2001
2 From: Florian Fainelli <florian@openwrt.org>
3 Date: Mon, 10 Dec 2012 20:55:54 +0100
4 Subject: [PATCH] Input: matrix-keymap - provide a proper module license
5
6 The matrix-keymap module is currently lacking a proper module license,
7 add one so we don't have this module tainting the entire kernel. This
8 issue has been present since commit 1932811f (Input: matrix-keymap -
9 uninline and prepare for device tree support)
10
11 Signed-off-by: Florian Fainelli <florian@openwrt.org>
12 CC: stable@vger.kernel.org
13 ---
14 Dmitry, can you try to push this to Linus before 3.7 final? Thank you
15
16 drivers/input/matrix-keymap.c | 3 +++
17 1 file changed, 3 insertions(+)
18
19 diff --git a/drivers/input/matrix-keymap.c b/drivers/input/matrix-keymap.c
20 index 443ad64b..d88d9be 100644
21 --- a/drivers/input/matrix-keymap.c
22 +++ b/drivers/input/matrix-keymap.c
23 @@ -23,6 +23,7 @@
24 #include <linux/input.h>
25 #include <linux/of.h>
26 #include <linux/export.h>
27 +#include <linux/module.h>
28 #include <linux/input/matrix_keypad.h>
29
30 static bool matrix_keypad_map_key(struct input_dev *input_dev,
31 @@ -161,3 +162,5 @@ int matrix_keypad_build_keymap(const struct matrix_keymap_data *keymap_data,
32 return 0;
33 }
34 EXPORT_SYMBOL(matrix_keypad_build_keymap);
35 +
36 +MODULE_LICENSE("GPL");
37 --
38 1.7.10.4
39