From 18982296c750b8bd433669adb28134d645e68932 Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 5 Mar 2012 13:29:54 +0000 Subject: Merge branch 'bcm63xx' git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30819 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/patches-3.3/321-powerpc_crtsavres_prereq.patch | 1 - target/linux/generic/patches-3.3/340-module_alloc_size_check.patch | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'target/linux/generic/patches-3.3') diff --git a/target/linux/generic/patches-3.3/321-powerpc_crtsavres_prereq.patch b/target/linux/generic/patches-3.3/321-powerpc_crtsavres_prereq.patch index df49ad017..941aa909d 100644 --- a/target/linux/generic/patches-3.3/321-powerpc_crtsavres_prereq.patch +++ b/target/linux/generic/patches-3.3/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.3/340-module_alloc_size_check.patch b/target/linux/generic/patches-3.3/340-module_alloc_size_check.patch index 9830bc507..549df5a66 100644 --- a/target/linux/generic/patches-3.3/340-module_alloc_size_check.patch +++ b/target/linux/generic/patches-3.3/340-module_alloc_size_check.patch @@ -1,6 +1,6 @@ --- a/kernel/module.c +++ b/kernel/module.c -@@ -2322,12 +2322,15 @@ +@@ -2322,12 +2322,15 @@ static void dynamic_debug_remove(struct void * __weak module_alloc(unsigned long size) { -- cgit v1.2.3