diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-03-05 13:29:54 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-03-05 13:29:54 +0000 |
| commit | 631a035a76580af3755e0151cc94d6685ab89949 (patch) | |
| tree | 547329f159981754f7dce31d7bc24c2369cdcb65 /target/linux/generic/patches-3.2 | |
| parent | 74946bb022331ea8717e33f6abe049968a20cb3c (diff) | |
| download | upstream-631a035a76580af3755e0151cc94d6685ab89949.tar.gz upstream-631a035a76580af3755e0151cc94d6685ab89949.tar.bz2 upstream-631a035a76580af3755e0151cc94d6685ab89949.zip | |
Merge branch 'bcm63xx'
SVN-Revision: 30819
Diffstat (limited to 'target/linux/generic/patches-3.2')
| -rw-r--r-- | target/linux/generic/patches-3.2/321-powerpc_crtsavres_prereq.patch | 1 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.2/340-module_alloc_size_check.patch | 2 |
2 files changed, 1 insertions, 2 deletions
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) { |