aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-08-16 13:44:57 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-08-16 13:44:57 +0000
commit3879c61bb6966574f5de7f3e291296924a6ad37b (patch)
tree15537fd6999693eaf1b4f162950910b86b896e6b
parentcb45c11c92536a7c756bcd01a9ef21d7d4c6a5f9 (diff)
downloadupstream-3879c61bb6966574f5de7f3e291296924a6ad37b.tar.gz
upstream-3879c61bb6966574f5de7f3e291296924a6ad37b.tar.bz2
upstream-3879c61bb6966574f5de7f3e291296924a6ad37b.zip
revert [8415], seems to be causing problems for the kernel build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8418 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/kernel.mk3
-rw-r--r--package/kernel/Makefile1
2 files changed, 1 insertions, 3 deletions
diff --git a/include/kernel.mk b/include/kernel.mk
index 5b27d2f459..df859a42b0 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -51,9 +51,6 @@ endif
GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic-$(KERNEL)
GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/patches$(shell [ -d "$(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
-ifeq ($(DUMP),)
- -include $(LINUX_DIR)/.config
-endif
define KernelPackage/Defaults
FILES:=
diff --git a/package/kernel/Makefile b/package/kernel/Makefile
index b805c6e19d..3ec07d43ac 100644
--- a/package/kernel/Makefile
+++ b/package/kernel/Makefile
@@ -18,6 +18,7 @@ SCAN_DEPS=modules/*.mk
include $(INCLUDE_DIR)/package.mk
ifeq ($(DUMP),)
+ -include $(LINUX_DIR)/.config
NF_KMOD:=1
include $(INCLUDE_DIR)/netfilter.mk
endif