summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-08-08 20:00:52 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-08-08 20:00:52 +0000
commitdaa8b37293f0a9ad5b57f71e7faeb3fde0f619d0 (patch)
tree08b1ffb90a8910ed85565d450af090caf3f22f0b
parentaa0dbefe6197fbee5041552f39939326cea6a60e (diff)
[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 ab6f54271..be6a51aed 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 4a6a89bc1..a927392b9 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"