domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: fix bluetooth and zsmalloc for 3.14

Browse Source 
zsmalloc was promoted from staging, while bluetooth gained a dependency
to a library shared with 802.15.4 for 6lowpan support.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 40379
This commit is contained in:
Jonas Gorski
2014-04-04 10:16:54 +00:00
parent 86fa1440c7
commit e098045dc2
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
package/kernel/linux/modules/other.mk
View File

@@ -10,10 +10,26 @@ OTHER_MENU:=Other modules
WATCHDOG_DIR:=watchdog
define KernelPackage/6lowpan-iphc
USBMENU:=$(OTHER_MENU)
TITLE:=6lowpan shared code
DEPENDS:=@LINUX_3_14
KCONFIG:=CONFIG_6LOWPAN_IPHC
HIDDEN:=1
FILES:=$(LINUX_DIR)/net/ieee802154/6lowpan_iphc.ko
AUTOLOAD:=$(call Autoprobe,6lowpan_iphc)
endef
define KernelPackage/6lowpan-iphc/description
Shared 6lowpan code for IEEE 802.15.4 and Bluetooth.
endef
$(eval $(call KernelPackage,6lowpan-iphc))
define KernelPackage/bluetooth
SUBMENU:=$(OTHER_MENU)
TITLE:=Bluetooth support
DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash
DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +LINUX_3_14:kmod-6lowpan-iphc
KCONFIG:= \
CONFIG_BLUEZ \
CONFIG_BLUEZ_L2CAP \
@@ -707,9 +723,15 @@ define KernelPackage/zram
CONFIG_ZRAM \
CONFIG_ZRAM_DEBUG=n \
CONFIG_PGTABLE_MAPPING=n
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.14.0)),1)
FILES:=\
$(LINUX_DIR)/mm/zsmalloc.ko \
$(LINUX_DIR)/drivers/block/zram/zram.ko
else
FILES:= \
$(LINUX_DIR)/drivers/staging/zsmalloc/zsmalloc.ko \
$(LINUX_DIR)/drivers/staging/zram/zram.ko
endif
AUTOLOAD:=$(call AutoLoad,20,zsmalloc zram)
endef