aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorHamish Guthrie <hcg@openwrt.org>2010-10-06 09:40:00 +0000
committerHamish Guthrie <hcg@openwrt.org>2010-10-06 09:40:00 +0000
commit7553598d3bb18ea7c11a80cb04728c6b14617bc6 (patch)
treebb475fc0f6ebfbc3e67fbd458e1aeff6d41931da /target
parent2daa37688d186752c1088615ac823e1beeb7b041 (diff)
downloadupstream-7553598d3bb18ea7c11a80cb04728c6b14617bc6.tar.gz
upstream-7553598d3bb18ea7c11a80cb04728c6b14617bc6.tar.bz2
upstream-7553598d3bb18ea7c11a80cb04728c6b14617bc6.zip
kernel: crashlog uses bootmem to allocate memory which is being deprecated in favour of memblock. microblaze, sh, arm, sparc and powerpc only have memblock.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23269 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/patches-2.6.36/930-crashlog.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-2.6.36/930-crashlog.patch b/target/linux/generic/patches-2.6.36/930-crashlog.patch
index fcffa1db0a..d729ea5ffb 100644
--- a/target/linux/generic/patches-2.6.36/930-crashlog.patch
+++ b/target/linux/generic/patches-2.6.36/930-crashlog.patch
@@ -21,7 +21,7 @@
+config CRASHLOG
+ bool "Crash logging"
-+ depends on !NO_BOOTMEM
++ depends on !NO_BOOTMEM && !HAVE_MEMBLOCK
+
config BLK_DEV_INITRD
bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"