diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-18 14:41:16 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-18 14:41:16 +0000 |
| commit | 56bc2d9958b929d934910e2c752b1a78cb46dd4c (patch) | |
| tree | 423d304c978d10050f7961db178868f4cbd46218 /target/linux/generic/patches-3.6/067-input_keymap_module_license.patch | |
| parent | 335bb39d959093ba93f117b0962b671f1136541d (diff) | |
kernel: update linux 3.6 to 3.6.11
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34748 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/067-input_keymap_module_license.patch')
| -rw-r--r-- | target/linux/generic/patches-3.6/067-input_keymap_module_license.patch | 34 |
1 files changed, 0 insertions, 34 deletions
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 deleted file mode 100644 index f95e06dca..000000000 --- a/target/linux/generic/patches-3.6/067-input_keymap_module_license.patch +++ /dev/null @@ -1,34 +0,0 @@ -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(+) - ---- 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 str - return 0; - } - EXPORT_SYMBOL(matrix_keypad_build_keymap); -+ -+MODULE_LICENSE("GPL"); |