From 631a035a76580af3755e0151cc94d6685ab89949 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 5 Mar 2012 13:29:54 +0000 Subject: Merge branch 'bcm63xx' SVN-Revision: 30819 --- target/linux/generic/patches-3.2/321-powerpc_crtsavres_prereq.patch | 1 - target/linux/generic/patches-3.2/340-module_alloc_size_check.patch | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'target/linux/generic/patches-3.2') diff --git a/target/linux/generic/patches-3.2/321-powerpc_crtsavres_prereq.patch b/target/linux/generic/patches-3.2/321-powerpc_crtsavres_prereq.patch index df49ad017a..941aa909de 100644 --- a/target/linux/generic/patches-3.2/321-powerpc_crtsavres_prereq.patch +++ b/target/linux/generic/patches-3.2/321-powerpc_crtsavres_prereq.patch @@ -8,4 +8,3 @@ ifeq ($(CONFIG_TUNE_CELL),y) KBUILD_CFLAGS += $(call cc-option,-mtune=cell) - diff --git a/target/linux/generic/patches-3.2/340-module_alloc_size_check.patch b/target/linux/generic/patches-3.2/340-module_alloc_size_check.patch index 6c7e50a0b1..88aa325333 100644 --- a/target/linux/generic/patches-3.2/340-module_alloc_size_check.patch +++ b/target/linux/generic/patches-3.2/340-module_alloc_size_check.patch @@ -1,6 +1,6 @@ --- a/kernel/module.c +++ b/kernel/module.c -@@ -2286,12 +2286,15 @@ +@@ -2283,12 +2283,15 @@ static void dynamic_debug_remove(struct void * __weak module_alloc(unsigned long size) { -- cgit v1.2.3