1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 18:35:55 +02:00

kernel: update to 3.7 final

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34626 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2012-12-11 11:31:17 +00:00
parent 6553643c12
commit d91c02e001
2 changed files with 3 additions and 39 deletions

View File

@ -8,6 +8,9 @@ endif
ifeq ($(LINUX_VERSION),3.6.9) ifeq ($(LINUX_VERSION),3.6.9)
LINUX_KERNEL_MD5SUM:=f77bac0a8f499f221d13a69317145610 LINUX_KERNEL_MD5SUM:=f77bac0a8f499f221d13a69317145610
endif endif
ifeq ($(LINUX_VERSION),3.7)
LINUX_KERNEL_MD5SUM:=21223369d682bcf44bcdfe1521095983
endif
# disable the md5sum check for unknown kernel versions # disable the md5sum check for unknown kernel versions
LINUX_KERNEL_MD5SUM?=x LINUX_KERNEL_MD5SUM?=x

View File

@ -1,39 +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(+)
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