aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.3
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-03-05 13:29:54 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-03-05 13:29:54 +0000
commit631a035a76580af3755e0151cc94d6685ab89949 (patch)
tree547329f159981754f7dce31d7bc24c2369cdcb65 /target/linux/generic/patches-3.3
parent74946bb022331ea8717e33f6abe049968a20cb3c (diff)
downloadupstream-631a035a76580af3755e0151cc94d6685ab89949.tar.gz
upstream-631a035a76580af3755e0151cc94d6685ab89949.tar.bz2
upstream-631a035a76580af3755e0151cc94d6685ab89949.zip
Merge branch 'bcm63xx'
SVN-Revision: 30819
Diffstat (limited to 'target/linux/generic/patches-3.3')
-rw-r--r--target/linux/generic/patches-3.3/321-powerpc_crtsavres_prereq.patch1
-rw-r--r--target/linux/generic/patches-3.3/340-module_alloc_size_check.patch2
2 files changed, 1 insertions, 2 deletions
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 df49ad017a..941aa909de 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 9830bc507c..549df5a667 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)
{