Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kernel: eliminate a few kernel_patchver_*/CompareKernelPatchVer calls

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 44114
This commit is contained in:
Felix Fietkau 2015-01-24 22:13:31 +00:00
parent 47e651e2eb
commit b8303e0337
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/kernel/linux/modules/hwmon.mk
View file

@ -46,7 +46,7 @@ $(eval $(call KernelPackage,hwmon-vid))
define KernelPackage/hwmon-adt7410 define KernelPackage/hwmon-adt7410
TITLE:=ADT7410 monitoring support TITLE:=ADT7410 monitoring support
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.10.0)),1) ifeq ($(CONFIG_LINUX_3_8)),)
KCONFIG:= \ KCONFIG:= \
CONFIG_SENSORS_ADT7X10 \ CONFIG_SENSORS_ADT7X10 \
CONFIG_SENSORS_ADT7410 CONFIG_SENSORS_ADT7410

13
package/kernel/linux/modules/leds.mk
View file

@ -22,12 +22,13 @@ endef
$(eval $(call KernelPackage,leds-gpio)) $(eval $(call KernelPackage,leds-gpio))
LED_TRIGGER_DIR=$(LINUX_DIR)/drivers/leds$(if $(CONFIG_LINUX_3_8),,/trigger)
define KernelPackage/ledtrig-heartbeat define KernelPackage/ledtrig-heartbeat
SUBMENU:=$(LEDS_MENU) SUBMENU:=$(LEDS_MENU)
TITLE:=LED Heartbeat Trigger TITLE:=LED Heartbeat Trigger
KCONFIG:=CONFIG_LEDS_TRIGGER_HEARTBEAT 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) AUTOLOAD:=$(call AutoLoad,50,ledtrig-heartbeat)
endef endef
@ -42,7 +43,7 @@ define KernelPackage/ledtrig-gpio
SUBMENU:=$(LEDS_MENU) SUBMENU:=$(LEDS_MENU)
TITLE:=LED GPIO Trigger TITLE:=LED GPIO Trigger
KCONFIG:=CONFIG_LEDS_TRIGGER_GPIO 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) AUTOLOAD:=$(call AutoLoad,50,ledtrig-gpio)
endef endef
@ -124,7 +125,7 @@ define KernelPackage/ledtrig-default-on
SUBMENU:=$(LEDS_MENU) SUBMENU:=$(LEDS_MENU)
TITLE:=LED Default ON Trigger TITLE:=LED Default ON Trigger
KCONFIG:=CONFIG_LEDS_TRIGGER_DEFAULT_ON 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) AUTOLOAD:=$(call AutoLoad,50,ledtrig-default-on,1)
endef endef
@ -139,7 +140,7 @@ define KernelPackage/ledtrig-timer
SUBMENU:=$(LEDS_MENU) SUBMENU:=$(LEDS_MENU)
TITLE:=LED Timer Trigger TITLE:=LED Timer Trigger
KCONFIG:=CONFIG_LEDS_TRIGGER_TIMER 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) AUTOLOAD:=$(call AutoLoad,50,ledtrig-timer,1)
endef endef
@ -155,7 +156,7 @@ define KernelPackage/ledtrig-transient
SUBMENU:=$(LEDS_MENU) SUBMENU:=$(LEDS_MENU)
TITLE:=LED Transient Trigger TITLE:=LED Transient Trigger
KCONFIG:=CONFIG_LEDS_TRIGGER_TRANSIENT 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) AUTOLOAD:=$(call AutoLoad,50,ledtrig-transient,1)
endef endef
@ -170,7 +171,7 @@ define KernelPackage/ledtrig-oneshot
SUBMENU:=$(LEDS_MENU) SUBMENU:=$(LEDS_MENU)
TITLE:=LED One-Shot Trigger TITLE:=LED One-Shot Trigger
KCONFIG:=CONFIG_LEDS_TRIGGER_ONESHOT 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) AUTOLOAD:=$(call AutoLoad,50,ledtrig-oneshot)
endef endef

2
package/kernel/linux/modules/usb.mk
View file

@ -338,7 +338,7 @@ define KernelPackage/usb-ohci
CONFIG_USB_OHCI_HCD_OMAP3=y \ CONFIG_USB_OHCI_HCD_OMAP3=y \
CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_OHCI_HCD_PLATFORM=y
FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko 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 FILES+=$(LINUX_DIR)/drivers/usb/host/ohci-platform.ko
endif endif
AUTOLOAD:=$(call AutoLoad,50,ohci-hcd ohci-platform,1) AUTOLOAD:=$(call AutoLoad,50,ohci-hcd ohci-platform,1)