From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 10 Dec 2012 21:05:42 +0000 (+0000)
Subject: generic: backport a fix for the input keymap-matrix module
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=0c25a5c4468a3cae0fc0cdb5fd6c34c43733f12c;p=openwrt.git

generic: backport a fix for the input keymap-matrix module

Signed-off-by: Florian Fainelli <florian@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34620 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/generic/patches-3.6/067-input_keymap_module_license.patch b/target/linux/generic/patches-3.6/067-input_keymap_module_license.patch
new file mode 100644
index 0000000000..4023042787
--- /dev/null
+++ b/target/linux/generic/patches-3.6/067-input_keymap_module_license.patch
@@ -0,0 +1,39 @@
+From 07b9a6cde27d690ea3331fc2ca2778902d929aaa Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian@openwrt.org>
+Date: Mon, 10 Dec 2012 20:55:54 +0100
+Subject: [PATCH] Input: matrix-keymap - provide a proper module license
+
+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
+---
+Dmitry, can you try to push this to Linus before 3.7 final? Thank you
+
+ 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.10.4
+
diff --git a/target/linux/generic/patches-3.7/067-input_keymap_module_license.patch b/target/linux/generic/patches-3.7/067-input_keymap_module_license.patch
new file mode 100644
index 0000000000..4023042787
--- /dev/null
+++ b/target/linux/generic/patches-3.7/067-input_keymap_module_license.patch
@@ -0,0 +1,39 @@
+From 07b9a6cde27d690ea3331fc2ca2778902d929aaa Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian@openwrt.org>
+Date: Mon, 10 Dec 2012 20:55:54 +0100
+Subject: [PATCH] Input: matrix-keymap - provide a proper module license
+
+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
+---
+Dmitry, can you try to push this to Linus before 3.7 final? Thank you
+
+ 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.10.4
+