diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2011-05-25 19:51:40 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-05-25 19:51:40 +0000 |
| commit | 7967debb9c75a5c434f23d703bca31c48c2a1f69 (patch) | |
| tree | 05fb7fc67febf88a128c92606ca34191df78356a /package/kernel/modules/other.mk | |
| parent | 22ca381be85d5c1089c61d05bc850f85ffce0e7a (diff) | |
| download | upstream-7967debb9c75a5c434f23d703bca31c48c2a1f69.tar.gz upstream-7967debb9c75a5c434f23d703bca31c48c2a1f69.tar.bz2 upstream-7967debb9c75a5c434f23d703bca31c48c2a1f69.zip | |
kernel: generic: Update 2.6.39 to final
* Add missing config symbols
* Update package/kernel for 2.6.39
CONFIG_BT_L2CAP=y and CONFIG_BT_SCO=y are set to build them into the bluetooth module.
Thank you Jonas Gorski for the patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27010 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/modules/other.mk')
| -rw-r--r-- | package/kernel/modules/other.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 5ab43368ee..3e17dc345d 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -38,14 +38,19 @@ define KernelPackage/bluetooth $(call AddDepends/rfkill) FILES:= \ $(LINUX_DIR)/net/bluetooth/bluetooth.ko \ - $(LINUX_DIR)/net/bluetooth/l2cap.ko \ - $(LINUX_DIR)/net/bluetooth/sco.ko \ $(LINUX_DIR)/net/bluetooth/rfcomm/rfcomm.ko \ $(LINUX_DIR)/net/bluetooth/bnep/bnep.ko \ $(LINUX_DIR)/net/bluetooth/hidp/hidp.ko \ $(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \ $(LINUX_DIR)/drivers/bluetooth/btusb.ko - AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart btusb) + ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.39)),1) + AUTOLOAD:=$(call AutoLoad,90,bluetooth rfcomm bnep hidp hci_uart btusb) + else + FILES+= \ + $(LINUX_DIR)/net/bluetooth/l2cap.ko \ + $(LINUX_DIR)/net/bluetooth/sco.ko + AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart btusb) + endif endef define KernelPackage/bluetooth/description |