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 | e6029cf3d704dddb5c5384675a20e3acc41d9181 (patch) | |
| tree | 35d0d5198e8b74db4acc09b4a81843b4047f7b24 /target/linux/generic/patches-3.2 | |
| parent | 12ec2ad963e88baf9863096dd7c857b8d717e75c (diff) | |
| download | master-187ad058-e6029cf3d704dddb5c5384675a20e3acc41d9181.tar.gz master-187ad058-e6029cf3d704dddb5c5384675a20e3acc41d9181.tar.bz2 master-187ad058-e6029cf3d704dddb5c5384675a20e3acc41d9181.zip | |
Merge branch 'bcm63xx'
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30819 3c298f89-4303-0410-b956-a3cf2f4a3e73
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) { |