qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-30 22:49:43 +02:00
Code

package/kernel: use macros for kmod-rfkill depends

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21102 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2010-04-23 04:08:26 +00:00
parent 6cbd378e23
commit 064e23bdd5
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/kernel/modules/001-depends.mk
View File

@ -14,3 +14,13 @@ endef
define AddDepends/crc16 define AddDepends/crc16
DEPENDS+= +!TARGET_xburst:kmod-crc16 DEPENDS+= +!TARGET_xburst:kmod-crc16
endef 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

6
package/kernel/modules/other.mk
View File

@ -262,8 +262,7 @@ $(eval $(call KernelPackage,ssb))
define KernelPackage/bluetooth define KernelPackage/bluetooth
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=Bluetooth support TITLE:=Bluetooth support
DEPENDS:=@USB_SUPPORT +kmod-usb-core +!TARGET_x86:kmod-hid \ DEPENDS:=@USB_SUPPORT +kmod-usb-core +!TARGET_x86:kmod-hid
+(TARGET_x86||TARGET_s3c24xx||TARGET_brcm47xx||TARGET_ar71xx):kmod-rfkill
KCONFIG:= \ KCONFIG:= \
CONFIG_BLUEZ \ CONFIG_BLUEZ \
CONFIG_BLUEZ_L2CAP \ CONFIG_BLUEZ_L2CAP \
@ -283,6 +282,7 @@ define KernelPackage/bluetooth
CONFIG_BT_HCIUART \ CONFIG_BT_HCIUART \
CONFIG_BT_HIDP CONFIG_BT_HIDP
$(call AddDepends/crc16) $(call AddDepends/crc16)
$(call AddDepends/rfkill)
endef endef
define KernelPackage/bluetooth/2.4 define KernelPackage/bluetooth/2.4
@ -854,7 +854,6 @@ $(eval $(call KernelPackage,textsearch))
define KernelPackage/rfkill define KernelPackage/rfkill
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=RF switch subsystem support TITLE:=RF switch subsystem support
DEPENDS:=@TARGET_x86||TARGET_s3c24xx||TARGET_brcm47xx||TARGET_ar71xx
KCONFIG:= \ KCONFIG:= \
CONFIG_RFKILL \ CONFIG_RFKILL \
CONFIG_RFKILL_INPUT=y \ CONFIG_RFKILL_INPUT=y \
@ -869,6 +868,7 @@ else
$(LINUX_DIR)/net/rfkill/rfkill-input.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/net/rfkill/rfkill-input.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,20,rfkill rfkill-input) AUTOLOAD:=$(call AutoLoad,20,rfkill rfkill-input)
endif endif
$(call SetDepends/rfkill)
endef endef
define KernelPackage/rfkill/description define KernelPackage/rfkill/description

3
package/kernel/modules/usb.mk
View File

@ -690,12 +690,13 @@ $(eval $(call KernelPackage,usb-net-asix))
define KernelPackage/usb-net-hso 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 TITLE:=Kernel module for Option USB High Speed Mobile Devices
KCONFIG:=CONFIG_USB_HSO KCONFIG:=CONFIG_USB_HSO
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/$(USBNET_DIR)/hso.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/$(USBNET_DIR)/hso.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,61,hso) AUTOLOAD:=$(call AutoLoad,61,hso)
$(call AddDepends/rfkill)
endef endef
define KernelPackage/usb-net-hso/description define KernelPackage/usb-net-hso/description