aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/067-input_keymap_module_license.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-12-11 20:14:39 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-12-11 20:14:39 +0000
commit2c0ebd76cfb548308807622ed4865f18d1808559 (patch)
treef36bbefa029c0849b8af1441dfa5b143128c3078 /target/linux/generic/patches-3.6/067-input_keymap_module_license.patch
parent64dc67c44a237d8d036e3488e4ff7ecf1a0d04e4 (diff)
downloadmaster-187ad058-2c0ebd76cfb548308807622ed4865f18d1808559.tar.gz
master-187ad058-2c0ebd76cfb548308807622ed4865f18d1808559.tar.bz2
master-187ad058-2c0ebd76cfb548308807622ed4865f18d1808559.zip
kernel: update linux 3.6 to 3.6.10
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34639 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.patch7
1 files changed, 1 insertions, 6 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
index 4023042787..f95e06dca1 100644
--- 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
@@ -16,8 +16,6 @@ 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 @@
@@ -28,12 +26,9 @@ index 443ad64b..d88d9be 100644
#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,
+@@ -161,3 +162,5 @@ int matrix_keypad_build_keymap(const str
return 0;
}
EXPORT_SYMBOL(matrix_keypad_build_keymap);
+
+MODULE_LICENSE("GPL");
---
-1.7.10.4
-