diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-07-21 11:55:30 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-07-21 11:55:30 +0000 |
| commit | 17e4d34085c69aff2702aad25b3258cbda75b416 (patch) | |
| tree | c0059015ebd93b50a6d6172a1575488365d09a3e /package/kernel/linux | |
| parent | cf5cd6958ace88eedf66938dc787e7deaa44669a (diff) | |
| download | upstream-17e4d34085c69aff2702aad25b3258cbda75b416.tar.gz upstream-17e4d34085c69aff2702aad25b3258cbda75b416.tar.bz2 upstream-17e4d34085c69aff2702aad25b3258cbda75b416.zip | |
kernel: add a new global config symbol for enabling rfkill support (can be enabled by default via target feature flag)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37491 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/linux')
| -rw-r--r-- | package/kernel/linux/modules/001-depends.mk | 7 | ||||
| -rw-r--r-- | package/kernel/linux/modules/other.mk | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/package/kernel/linux/modules/001-depends.mk b/package/kernel/linux/modules/001-depends.mk index ed894311cc..d0ad083662 100644 --- a/package/kernel/linux/modules/001-depends.mk +++ b/package/kernel/linux/modules/001-depends.mk @@ -22,13 +22,8 @@ define AddDepends/nls DEPENDS+= +kmod-nls-base $(foreach cp,$(1),+kmod-nls-$(cp)) endef - -define SetDepends/rfkill - DEPENDS:= @(TARGET_ar71xx||TARGET_brcm47xx||TARGET_s3c24xx||TARGET_x86||TARGET_gemini||TARGET_cns3xxx||TARGET_ixp4xx) $(1) -endef - define AddDepends/rfkill - DEPENDS+= +(TARGET_ar71xx||TARGET_brcm47xx||TARGET_s3c24xx||TARGET_x86||TARGET_cns3xxx||TARGET_ixp4xx):kmod-rfkill $(1) + DEPENDS+= +USE_RFKILL:kmod-rfkill $(1) endef diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 44bc870b88..b9ffaa0e42 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -239,6 +239,7 @@ $(eval $(call KernelPackage,oprofile)) define KernelPackage/rfkill SUBMENU:=$(OTHER_MENU) TITLE:=RF switch subsystem support + DEPENDS:=@USE_RFKILL +kmod-input-core KCONFIG:= \ CONFIG_RFKILL \ CONFIG_RFKILL_INPUT=y \ @@ -247,7 +248,6 @@ define KernelPackage/rfkill FILES:= \ $(LINUX_DIR)/net/rfkill/rfkill.ko AUTOLOAD:=$(call AutoLoad,20,rfkill) - $(call SetDepends/rfkill,+kmod-input-core) endef define KernelPackage/rfkill/description |