diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-23 04:08:26 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-23 04:08:26 +0000 |
| commit | 064e23bdd5df63bfebe511f6416376db6d5f95f6 (patch) | |
| tree | fca0c9083664f5bd877f51ddbab26088c89ce632 /package | |
| parent | 6cbd378e239b57f5d160f712780b72a0718dfe43 (diff) | |
package/kernel: use macros for kmod-rfkill depends
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21102 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/kernel/modules/001-depends.mk | 10 | ||||
| -rw-r--r-- | package/kernel/modules/other.mk | 6 | ||||
| -rw-r--r-- | package/kernel/modules/usb.mk | 3 |
3 files changed, 15 insertions, 4 deletions
diff --git a/package/kernel/modules/001-depends.mk b/package/kernel/modules/001-depends.mk index 2446d3e4b..826734ec9 100644 --- a/package/kernel/modules/001-depends.mk +++ b/package/kernel/modules/001-depends.mk @@ -14,3 +14,13 @@ endef define AddDepends/crc16 DEPENDS+= +!TARGET_xburst:kmod-crc16 endef + + +define SetDepends/rfkill + DEPENDS:= @(TARGET_ar71xx||TARGET_brcm47xx||TARGET_s3c24xx||TARGET_x86) +endef + +define AddDepends/rfkill + DEPENDS+= +(TARGET_ar71xx||TARGET_brcm47xx||TARGET_s3c24xx||TARGET_x86):kmod-rfkill + +endef diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index d00b6f78a..aaa7bf008 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -262,8 +262,7 @@ $(eval $(call KernelPackage,ssb)) define KernelPackage/bluetooth SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth support - DEPENDS:=@USB_SUPPORT +kmod-usb-core +!TARGET_x86:kmod-hid \ - +(TARGET_x86||TARGET_s3c24xx||TARGET_brcm47xx||TARGET_ar71xx):kmod-rfkill + DEPENDS:=@USB_SUPPORT +kmod-usb-core +!TARGET_x86:kmod-hid KCONFIG:= \ CONFIG_BLUEZ \ CONFIG_BLUEZ_L2CAP \ @@ -283,6 +282,7 @@ define KernelPackage/bluetooth CONFIG_BT_HCIUART \ CONFIG_BT_HIDP $(call AddDepends/crc16) + $(call AddDepends/rfkill) endef define KernelPackage/bluetooth/2.4 @@ -854,7 +854,6 @@ $(eval $(call KernelPackage,textsearch)) define KernelPackage/rfkill SUBMENU:=$(OTHER_MENU) TITLE:=RF switch subsystem support - DEPENDS:=@TARGET_x86||TARGET_s3c24xx||TARGET_brcm47xx||TARGET_ar71xx KCONFIG:= \ CONFIG_RFKILL \ CONFIG_RFKILL_INPUT=y \ @@ -869,6 +868,7 @@ else $(LINUX_DIR)/net/rfkill/rfkill-input.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,rfkill rfkill-input) endif + $(call SetDepends/rfkill) endef define KernelPackage/rfkill/description diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index a5244d6d3..02c6ba889 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -690,12 +690,13 @@ $(eval $(call KernelPackage,usb-net-asix)) define KernelPackage/usb-net-hso -$(call KernelPackage/usb-net/Depends,@LINUX_2_6 +!TARGET_rb532||!TARGET_avr32||!TARGET_brcm47xx||!TARGET_s3c24xx||!TARGET_ifxmips||!TARGET_atheros||!TARGET_adm5120||!TARGET_ar7||!TARGET_ppc40x||!TARGET_ixp4xx||!TARGET_rdc:kmod-rfkill) +$(call KernelPackage/usb-net/Depends,@LINUX_2_6) TITLE:=Kernel module for Option USB High Speed Mobile Devices KCONFIG:=CONFIG_USB_HSO FILES:= \ $(LINUX_DIR)/drivers/$(USBNET_DIR)/hso.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,61,hso) + $(call AddDepends/rfkill) endef define KernelPackage/usb-net-hso/description |