diff options
| author | Nicolas Thill <nico@openwrt.org> | 2008-05-08 11:16:07 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2008-05-08 11:16:07 +0000 |
| commit | 1c6a4018a3c8148345e67ace68237e7285eb509a (patch) | |
| tree | e6f140669a542f6bd89e508355bf644aa35a624b | |
| parent | 5ed5df3c4563a687ecfa9e0ece7690b86d6f428b (diff) | |
| download | upstream-1c6a4018a3c8148345e67ace68237e7285eb509a.tar.gz upstream-1c6a4018a3c8148345e67ace68237e7285eb509a.tar.bz2 upstream-1c6a4018a3c8148345e67ace68237e7285eb509a.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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11072 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/kernel/Makefile | 4 | ||||
| -rw-r--r-- | package/kernel/modules/netfilter.mk | 3 |
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 |