summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-05-19 18:36:09 +0000
committerJonas Gorski <jogo@openwrt.org>2013-05-19 18:36:09 +0000
commit87203c404996884334a9584fce0d8a251bf9fb43 (patch)
tree94621767ef026622f1705d8be417960559dfb7c5
parent89e299259ca01e415bfc4af16ddf0eccc1ff64a5 (diff)
downloadmaster-31e0f0ae-87203c404996884334a9584fce0d8a251bf9fb43.tar.gz
master-31e0f0ae-87203c404996884334a9584fce0d8a251bf9fb43.tar.bz2
master-31e0f0ae-87203c404996884334a9584fce0d8a251bf9fb43.zip
kernel: adapt module paths for 3.10-rc1
Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 36662
-rw-r--r--package/kernel/modules/leds.mk10
-rw-r--r--package/kernel/modules/other.mk2
2 files changed, 6 insertions, 6 deletions
diff --git a/package/kernel/modules/leds.mk b/package/kernel/modules/leds.mk
index b2402c956f..c77c7ed444 100644
--- a/package/kernel/modules/leds.mk
+++ b/package/kernel/modules/leds.mk
@@ -28,7 +28,7 @@ define KernelPackage/ledtrig-heartbeat
SUBMENU:=$(LEDS_MENU)
TITLE:=LED Heartbeat Trigger
KCONFIG:=CONFIG_LEDS_TRIGGER_HEARTBEAT
- FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-heartbeat.ko
+ FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-heartbeat.ko
AUTOLOAD:=$(call AutoLoad,50,ledtrig-heartbeat)
endef
@@ -43,7 +43,7 @@ define KernelPackage/ledtrig-gpio
SUBMENU:=$(LEDS_MENU)
TITLE:=LED GPIO Trigger
KCONFIG:=CONFIG_LEDS_TRIGGER_GPIO
- FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-gpio.ko
+ FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-gpio.ko
AUTOLOAD:=$(call AutoLoad,50,ledtrig-gpio)
endef
@@ -125,7 +125,7 @@ define KernelPackage/ledtrig-default-on
SUBMENU:=$(LEDS_MENU)
TITLE:=LED Default ON Trigger
KCONFIG:=CONFIG_LEDS_TRIGGER_DEFAULT_ON
- FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-default-on.ko
+ FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-default-on.ko
AUTOLOAD:=$(call AutoLoad,50,ledtrig-default-on)
endef
@@ -140,7 +140,7 @@ define KernelPackage/ledtrig-timer
SUBMENU:=$(LEDS_MENU)
TITLE:=LED Timer Trigger
KCONFIG:=CONFIG_LEDS_TRIGGER_TIMER
- FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-timer.ko
+ FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-timer.ko
AUTOLOAD:=$(call AutoLoad,50,ledtrig-timer)
endef
@@ -157,7 +157,7 @@ define KernelPackage/ledtrig-oneshot
TITLE:=LED One-Shot Trigger
DEPENDS:=@!LINUX_3_3
KCONFIG:=CONFIG_LEDS_TRIGGER_ONESHOT
- FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-oneshot.ko
+ FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-oneshot.ko
AUTOLOAD:=$(call AutoLoad,50,ledtrig-oneshot)
endef
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index f282014a30..aa16c142eb 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -551,7 +551,7 @@ define KernelPackage/serial-8250
CONFIG_SERIAL_8250_SHARE_IRQ=y \
CONFIG_SERIAL_8250_DETECT_IRQ=n \
CONFIG_SERIAL_8250_RSA=n
- FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/8250$(if $(call kernel_patchver_ge,3.7),_core).ko
+ FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/8250$(if $(call kernel_patchver_ge,3.7),$(if $(call kernel_patchver_le,3.9),_core)).ko
endef
define KernelPackage/serial-8250/description