aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
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
commit0dc830c8f19e27bac31c72eba42cfcb4ad3838cf (patch)
tree8f39e9c2c9a8e76a428303b8734e5badba3e61a8 /target/linux
parent8dc04c901833620d7dad4bdfb2045eb3a9cb70c6 (diff)
downloadupstream-0dc830c8f19e27bac31c72eba42cfcb4ad3838cf.tar.gz
upstream-0dc830c8f19e27bac31c72eba42cfcb4ad3838cf.tar.bz2
upstream-0dc830c8f19e27bac31c72eba42cfcb4ad3838cf.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.
SVN-Revision: 23269
Diffstat (limited to 'target/linux')
-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"