kernel: reorganize 2.6.37 patches

[openwrt.git] / target / linux / generic / patches-2.6.36 / 930-crashlog.patch

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 a927392b9ef46eff553a0c62434b2419ada01a99..d729ea5ffb590e66d77dcdf84a6fc146714846a6 100644 (file)
--- a/target/linux/generic/patches-2.6.36/930-crashlog.patch
+++ b/target/linux/generic/patches-2.6.36/930-crashlog.patch
@@ -15,20 +15,20 @@
 +#endif
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -749,6 +749,10 @@ config NET_NS
+@@ -753,6 +753,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
++      depends on !NO_BOOTMEM && !HAVE_MEMBLOCK
 +
  config BLK_DEV_INITRD
        bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
        depends on BROKEN || !FRV
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
-@@ -105,6 +105,7 @@ obj-$(CONFIG_PERF_EVENTS) += perf_event.
+@@ -104,6 +104,7 @@ obj-$(CONFIG_PERF_EVENTS) += perf_event.
  obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
  obj-$(CONFIG_USER_RETURN_NOTIFIER) += user-return-notifier.o
  obj-$(CONFIG_PADATA) += padata.o