Changeset 40379


Ignore:
Timestamp:
2014-04-04T12:16:54+02:00 (4 years ago)
Author:
jogo
Message:

kernel: fix bluetooth and zsmalloc for 3.14

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@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/linux/modules/other.mk

    r39907 r40379  
    1111 
    1212 
     13define KernelPackage/6lowpan-iphc 
     14  USBMENU:=$(OTHER_MENU) 
     15  TITLE:=6lowpan shared code 
     16  DEPENDS:=@LINUX_3_14 
     17  KCONFIG:=CONFIG_6LOWPAN_IPHC 
     18  HIDDEN:=1 
     19  FILES:=$(LINUX_DIR)/net/ieee802154/6lowpan_iphc.ko 
     20  AUTOLOAD:=$(call Autoprobe,6lowpan_iphc) 
     21endef 
     22 
     23define KernelPackage/6lowpan-iphc/description 
     24  Shared 6lowpan code for IEEE 802.15.4 and Bluetooth. 
     25endef 
     26 
     27$(eval $(call KernelPackage,6lowpan-iphc)) 
     28 
    1329define KernelPackage/bluetooth 
    1430  SUBMENU:=$(OTHER_MENU) 
    1531  TITLE:=Bluetooth support 
    16   DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash 
     32  DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +LINUX_3_14:kmod-6lowpan-iphc 
    1733  KCONFIG:= \ 
    1834        CONFIG_BLUEZ \ 
     
    708724        CONFIG_ZRAM_DEBUG=n \ 
    709725        CONFIG_PGTABLE_MAPPING=n 
     726ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.14.0)),1) 
     727  FILES:=\ 
     728        $(LINUX_DIR)/mm/zsmalloc.ko \ 
     729        $(LINUX_DIR)/drivers/block/zram/zram.ko 
     730else 
    710731  FILES:= \ 
    711732        $(LINUX_DIR)/drivers/staging/zsmalloc/zsmalloc.ko \ 
    712733        $(LINUX_DIR)/drivers/staging/zram/zram.ko 
     734endif 
    713735  AUTOLOAD:=$(call AutoLoad,20,zsmalloc zram) 
    714736endef 
Note: See TracChangeset for help on using the changeset viewer.