aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-08-08 20:00:52 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-08-08 20:00:52 +0000
commitfc2a9bd7c845f15379fc039fbde51b1cd1efd844 (patch)
tree08b1ffb90a8910ed85565d450af090caf3f22f0b
parentbbc8d7180488a2135118cf4d0efeed6a1af7cbc7 (diff)
downloadupstream-fc2a9bd7c845f15379fc039fbde51b1cd1efd844.tar.gz
upstream-fc2a9bd7c845f15379fc039fbde51b1cd1efd844.tar.bz2
upstream-fc2a9bd7c845f15379fc039fbde51b1cd1efd844.zip
[kernel] crashlog depends on BOOTMEM
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22541 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic/patches-2.6.34/930-crashlog.patch3
-rw-r--r--target/linux/generic/patches-2.6.35/930-crashlog.patch3
2 files changed, 4 insertions, 2 deletions
diff --git a/target/linux/generic/patches-2.6.34/930-crashlog.patch b/target/linux/generic/patches-2.6.34/930-crashlog.patch
index ab6f542714..be6a51aed7 100644
--- a/target/linux/generic/patches-2.6.34/930-crashlog.patch
+++ b/target/linux/generic/patches-2.6.34/930-crashlog.patch
@@ -15,12 +15,13 @@
+#endif
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -715,6 +715,9 @@ config NET_NS
+@@ -715,6 +715,10 @@ config NET_NS
Allow user space to create what appear to be multiple instances
of the network stack.
+config CRASHLOG
+ bool "Crash logging"
++ depends on !NO_BOOTMEM
+
config BLK_DEV_INITRD
bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
diff --git a/target/linux/generic/patches-2.6.35/930-crashlog.patch b/target/linux/generic/patches-2.6.35/930-crashlog.patch
index 4a6a89bc11..a927392b9e 100644
--- a/target/linux/generic/patches-2.6.35/930-crashlog.patch
+++ b/target/linux/generic/patches-2.6.35/930-crashlog.patch
@@ -15,12 +15,13 @@
+#endif
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -749,6 +749,9 @@ config NET_NS
+@@ -749,6 +749,10 @@ config NET_NS
Allow user space to create what appear to be multiple instances
of the network stack.
+config CRASHLOG
+ bool "Crash logging"
++ depends on !NO_BOOTMEM
+
config BLK_DEV_INITRD
bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"