package/kernel fixes: - remove dup netfilter.mk includes - always define NF_KMOD...

SVN-Revision: 11072

diff --git a/package/kernel/Makefile b/package/kernel/Makefile
index d6364f12fe1ccc56a5aaec8194500a99e91f96a8..036af764f14353c7fad4793e25dfef64cc900558 100644 (file)
--- 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 3eeb7aa6a0a5b28301dbb9ff8ac4ab5ad718398d..d6e2a606126a67bf55651b122c9ba7429c36b69c 100644 (file)
--- 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