summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/kernel/Makefile16
-rw-r--r--package/kernel/modules.mk8
2 files changed, 10 insertions, 14 deletions
diff --git a/package/kernel/Makefile b/package/kernel/Makefile
index 39978ab9f..c977501e0 100644
--- a/package/kernel/Makefile
+++ b/package/kernel/Makefile
@@ -60,10 +60,6 @@ define KernelPackage
$(eval $(call KernelPackage/$(1)))
$(eval $(call KernelPackage/$(1)/$(KERNEL)))
- ifneq ($(findstring m,$(KCONFIG)),m)
- CONFIG_PACKAGE_kmod-$(1):=
- endif
-
define Package/kmod-$(1)
TITLE:=$(TITLE)
SECTION:=kernel
@@ -75,11 +71,13 @@ define KernelPackage
$(call KernelPackage/$(1)/$(KERNEL))
endef
- define Package/kmod-$(1)/install
- mkdir -p $$(1)/lib/modules/$(LINUX_VERSION)
- $(CP) $(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/
- $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
- endef
+ ifeq ($(findstring m,$(KCONFIG)),m)
+ define Package/kmod-$(1)/install
+ mkdir -p $$(1)/lib/modules/$(LINUX_VERSION)
+ $(CP) $$(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/
+ $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
+ endef
+ endif
$$(eval $$(call BuildPackage,kmod-$(1)))
endef
diff --git a/package/kernel/modules.mk b/package/kernel/modules.mk
index f1e1009d1..2f5a50ff7 100644
--- a/package/kernel/modules.mk
+++ b/package/kernel/modules.mk
@@ -152,13 +152,11 @@ $(eval $(call KernelPackage,ipt-nathelper))
define KernelPackage/ipt-imq
TITLE:=Intermediate Queueing support
DESCRIPTION:=Kernel support for Intermediate Queueing devices
-KCONFIG:=$(CONFIG_IMQ)
+KCONFIG:=$(CONFIG_IP_NF_TARGET_IMQ)
SUBMENU:=$(NFMENU)
-FILES:= \
- $(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) \
- $(MODULES_DIR)/kernel/drivers/net/imq.$(LINUX_KMOD_SUFFIX)
+FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/imq.$(LINUX_KMOD_SUFFIX)
endef
-$(eval $(call KernelPackage,imq))
+$(eval $(call KernelPackage,ipt-imq))
define KernelPackage/ipt-queue