From 0f64b1d870e18f69729d9279f0c573ce2ecb0479 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 19 Aug 2010 12:49:56 +0000 Subject: [PATCH] kernel: speed up building kernel packages by getting rid of unnecessary CompareKernelPatchVer calls SVN-Revision: 22724 --- package/kernel/modules/other.mk | 2 +- package/kernel/modules/pcmcia.mk | 3 ++- package/kernel/modules/usb.mk | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index f27e2efabe..59ddde370a 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -552,7 +552,7 @@ define KernelPackage/rfkill CONFIG_RFKILL \ CONFIG_RFKILL_INPUT=y \ CONFIG_RFKILL_LEDS=y -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.31)),1) +ifeq ($(CONFIG_LINUX_2_6_30),) FILES:= \ $(LINUX_DIR)/net/rfkill/rfkill.ko AUTOLOAD:=$(call AutoLoad,20,rfkill) diff --git a/package/kernel/modules/pcmcia.mk b/package/kernel/modules/pcmcia.mk index 9dee29817e..c7cc8f8abc 100644 --- a/package/kernel/modules/pcmcia.mk +++ b/package/kernel/modules/pcmcia.mk @@ -54,7 +54,8 @@ define KernelPackage/pcmcia-yenta KCONFIG:= \ CONFIG_PCCARD_NONSTATIC \ CONFIG_YENTA -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1) +# For Linux 2.6.35+ +ifneq ($(wildcard $(LINUX_DIR)/drivers/pcmcia/pcmcia_rsrc.ko),) FILES:= \ $(LINUX_DIR)/drivers/pcmcia/pcmcia_rsrc.ko \ $(LINUX_DIR)/drivers/pcmcia/yenta_socket.ko diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 7144833158..45f69f638b 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -145,7 +145,8 @@ define KernelPackage/usb-audio CONFIG_SND_USB_AUDIO $(call AddDepends/usb) $(call AddDepends/sound) -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1) +# For Linux 2.6.35+ +ifneq ($(wildcard $(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko),) FILES:= \ $(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko \ $(LINUX_DIR)/sound/usb/snd-usb-audio.ko -- 2.25.1