From 26fc64b75e6d5d1dbadc26b78a714ce22c6e6d23 Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 5 May 2010 12:01:17 +0000 Subject: [PATCH] [backfire] adjust kmod-crc16 dependencies and dependencies on kmod-crc16 (closes: #7063) git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21377 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/netsupport.mk | 2 +- package/kernel/modules/other.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 0c0c91244..462be0028 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -601,7 +601,7 @@ $(eval $(call KernelPackage,sched)) define KernelPackage/ax25 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=AX25 support - DEPENDS:= +kmod-crc16 + DEPENDS:= +!(LINUX_2_4||TARGET_xburst):kmod-crc16 KCONFIG:= \ CONFIG_AX25 \ CONFIG_MKISS diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 88b57c565..ffcb48ffd 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -62,6 +62,7 @@ $(eval $(call KernelPackage,crc7)) define KernelPackage/crc16 SUBMENU:=$(OTHER_MENU) TITLE:=CRC16 support + DEPENDS:=@!(LINUX_2_4||TARGET_xburst) KCONFIG:=CONFIG_CRC16 FILES:=$(LINUX_DIR)/lib/crc16.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,crc16,1) @@ -275,7 +276,7 @@ $(eval $(call KernelPackage,ssb)) define KernelPackage/bluetooth SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth support - DEPENDS:=@USB_SUPPORT +kmod-crc16 +kmod-usb-core +!TARGET_x86:kmod-hid \ + DEPENDS:=@USB_SUPPORT +!(LINUX_2_4||TARGET_xburst):kmod-crc16 +kmod-usb-core +!TARGET_x86:kmod-hid \ +(TARGET_x86||TARGET_s3c24xx||TARGET_brcm47xx||TARGET_ar71xx):kmod-rfkill KCONFIG:= \ CONFIG_BLUEZ \