mirror of https://github.com/hak5/openwrt.git
generic: backport a fix for the input keymap-matrix module
Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 34620lede-17.01
parent
87c8808ca5
commit
cbfca35c76
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue