aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2008-05-08 11:16:07 +0000
committerNicolas Thill <nico@openwrt.org>2008-05-08 11:16:07 +0000
commit50ee10f4864f91a376e1143aaf584f8622249ab3 (patch)
treead7c6bedabf7cf58daa7f6492bfb9c967015efad /package/kernel
parenta78ea864ccaf4aa54d661269fe298f78e8dfca3e (diff)
downloadupstream-50ee10f4864f91a376e1143aaf584f8622249ab3.tar.gz
upstream-50ee10f4864f91a376e1143aaf584f8622249ab3.tar.bz2
upstream-50ee10f4864f91a376e1143aaf584f8622249ab3.zip
package/kernel fixes: - remove dup netfilter.mk includes - always define NF_KMOD so that proper KCONFIG entries are emitted for netfilter modules at DUMP time
SVN-Revision: 11072
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/Makefile4
-rw-r--r--package/kernel/modules/netfilter.mk3
2 files changed, 3 insertions, 4 deletions
diff --git a/package/kernel/Makefile b/package/kernel/Makefile
index d6364f12fe..036af764f1 100644
--- a/package/kernel/Makefile
+++ b/package/kernel/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -17,8 +17,6 @@ SCAN_DEPS=modules/*.mk
include $(INCLUDE_DIR)/package.mk
ifeq ($(DUMP),)
-include $(LINUX_DIR)/.config
- NF_KMOD:=1
- include $(INCLUDE_DIR)/netfilter.mk
endif
define Build/Prepare
diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index 3eeb7aa6a0..d6e2a60612 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -7,6 +7,7 @@
# $Id$
NF_MENU:=Netfilter Extensions
+NF_KMOD:=1
include $(INCLUDE_DIR)/netfilter.mk
define KernelPackage/ipt-conntrack