aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
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
commit083ff78000c65c6edeb69db4a0d6b81bec19afa4 (patch)
tree518dfc13de8fab7ee34de982591c6231c7229711 /target/linux
parent35e7fc9c4b0486f5458b368d1d8d1a285556f414 (diff)
downloadupstream-083ff78000c65c6edeb69db4a0d6b81bec19afa4.tar.gz
upstream-083ff78000c65c6edeb69db4a0d6b81bec19afa4.tar.bz2
upstream-083ff78000c65c6edeb69db4a0d6b81bec19afa4.zip
crashlog depends on BOOTMEM
SVN-Revision: 22541
Diffstat (limited to 'target/linux')
-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"