Author: nbd Date: 2015-01-24 23:13:31 +0100 (Sat, 24 Jan 2015) New Revision: 44114
Modified: trunk/package/kernel/linux/modules/hwmon.mk trunk/package/kernel/linux/modules/leds.mk trunk/package/kernel/linux/modules/usb.mk Log: kernel: eliminate a few kernel_patchver_*/CompareKernelPatchVer calls Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/kernel/linux/modules/hwmon.mk =================================================================== --- trunk/package/kernel/linux/modules/hwmon.mk 2015-01-24 22:13:22 UTC (rev 44113) +++ trunk/package/kernel/linux/modules/hwmon.mk 2015-01-24 22:13:31 UTC (rev 44114) @@ -46,7 +46,7 @@ define KernelPackage/hwmon-adt7410 TITLE:=ADT7410 monitoring support -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.10.0)),1) +ifeq ($(CONFIG_LINUX_3_8)),) KCONFIG:= \ CONFIG_SENSORS_ADT7X10 \ CONFIG_SENSORS_ADT7410 Modified: trunk/package/kernel/linux/modules/leds.mk =================================================================== --- trunk/package/kernel/linux/modules/leds.mk 2015-01-24 22:13:22 UTC (rev 44113) +++ trunk/package/kernel/linux/modules/leds.mk 2015-01-24 22:13:31 UTC (rev 44114) @@ -22,12 +22,13 @@ $(eval $(call KernelPackage,leds-gpio)) +LED_TRIGGER_DIR=$(LINUX_DIR)/drivers/leds$(if $(CONFIG_LINUX_3_8),,/trigger) define KernelPackage/ledtrig-heartbeat SUBMENU:=$(LEDS_MENU) TITLE:=LED Heartbeat Trigger KCONFIG:=CONFIG_LEDS_TRIGGER_HEARTBEAT - FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-heartbeat.ko + FILES:=$(LED_TRIGGER_DIR)/ledtrig-heartbeat.ko AUTOLOAD:=$(call AutoLoad,50,ledtrig-heartbeat) endef @@ -42,7 +43,7 @@ SUBMENU:=$(LEDS_MENU) TITLE:=LED GPIO Trigger KCONFIG:=CONFIG_LEDS_TRIGGER_GPIO - FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-gpio.ko + FILES:=$(LED_TRIGGER_DIR)/ledtrig-gpio.ko AUTOLOAD:=$(call AutoLoad,50,ledtrig-gpio) endef @@ -124,7 +125,7 @@ SUBMENU:=$(LEDS_MENU) TITLE:=LED Default ON Trigger KCONFIG:=CONFIG_LEDS_TRIGGER_DEFAULT_ON - FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-default-on.ko + FILES:=$(LED_TRIGGER_DIR)/ledtrig-default-on.ko AUTOLOAD:=$(call AutoLoad,50,ledtrig-default-on,1) endef @@ -139,7 +140,7 @@ SUBMENU:=$(LEDS_MENU) TITLE:=LED Timer Trigger KCONFIG:=CONFIG_LEDS_TRIGGER_TIMER - FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-timer.ko + FILES:=$(LED_TRIGGER_DIR)/ledtrig-timer.ko AUTOLOAD:=$(call AutoLoad,50,ledtrig-timer,1) endef @@ -155,7 +156,7 @@ SUBMENU:=$(LEDS_MENU) TITLE:=LED Transient Trigger KCONFIG:=CONFIG_LEDS_TRIGGER_TRANSIENT - FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-transient.ko + FILES:=$(LED_TRIGGER_DIR)/ledtrig-transient.ko AUTOLOAD:=$(call AutoLoad,50,ledtrig-transient,1) endef @@ -170,7 +171,7 @@ SUBMENU:=$(LEDS_MENU) TITLE:=LED One-Shot Trigger KCONFIG:=CONFIG_LEDS_TRIGGER_ONESHOT - FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-oneshot.ko + FILES:=$(LED_TRIGGER_DIR)/ledtrig-oneshot.ko AUTOLOAD:=$(call AutoLoad,50,ledtrig-oneshot) endef Modified: trunk/package/kernel/linux/modules/usb.mk =================================================================== --- trunk/package/kernel/linux/modules/usb.mk 2015-01-24 22:13:22 UTC (rev 44113) +++ trunk/package/kernel/linux/modules/usb.mk 2015-01-24 22:13:31 UTC (rev 44114) @@ -338,7 +338,7 @@ CONFIG_USB_OHCI_HCD_OMAP3=y \ CONFIG_USB_OHCI_HCD_PLATFORM=y FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.11.0)),1) +ifeq ($(CONFIG_LINUX_3_8)$(CONFIG_LINUX_3_10),) FILES+=$(LINUX_DIR)/drivers/usb/host/ohci-platform.ko endif AUTOLOAD:=$(call AutoLoad,50,ohci-hcd ohci-platform,1) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
