From a3626aca95c5ec865a53b8bce2f739c77c3247da Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 31 Jan 2015 13:55:51 +0000 Subject: linux: convert CompareKernelPatchVer to version tagged symbols Signed-off-by: Jo-Philipp Wich git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44229 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/linux/modules/other.mk | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'package/kernel/linux/modules/other.mk') diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index a69d817ed3..2800387a0a 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -261,11 +261,9 @@ define KernelPackage/iio-ad799x KCONFIG:= \ CONFIG_AD799X_RING_BUFFER=y \ CONFIG_AD799X -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.16.0)),1) - FILES:=$(LINUX_DIR)/drivers/iio/adc/ad799x.ko -else - FILES:=$(LINUX_DIR)/drivers/staging/iio/adc/ad799x.ko -endif + FILES:= \ + $(LINUX_DIR)/drivers/staging/iio/adc/ad799x.ko@lt3.16 \ + $(LINUX_DIR)/drivers/iio/adc/ad799x.ko@ge3.16 AUTOLOAD:=$(call AutoLoad,56,ad799x) endef @@ -755,15 +753,11 @@ define KernelPackage/zram CONFIG_ZRAM_DEBUG=n \ CONFIG_PGTABLE_MAPPING=n \ CONFIG_ZRAM_LZ4_COMPRESS=y -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 + $(LINUX_DIR)/drivers/staging/zsmalloc/zsmalloc.ko@lt3.14 \ + $(LINUX_DIR)/drivers/staging/zram/zram.ko@lt3.14 \ + $(LINUX_DIR)/mm/zsmalloc.ko@ge3.14 \ + $(LINUX_DIR)/drivers/block/zram/zram.ko@ge3.14 AUTOLOAD:=$(call AutoLoad,20,zsmalloc zram) endef -- cgit v1.2.3