X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fleds.mk;h=980d62610ab856d99626550eb276d01f03f1b781;hb=801985e5286881dd578a19280b2a6c8e212a530d;hp=5b9b017042d82347dd9d9df28bff064d3a0bc761;hpb=1fd96a6463fe633bb62ff78bc886854fb0d7b782;p=openwrt.git

diff --git a/package/kernel/modules/leds.mk b/package/kernel/modules/leds.mk
index 5b9b017042..980d62610a 100644
--- a/package/kernel/modules/leds.mk
+++ b/package/kernel/modules/leds.mk
@@ -14,7 +14,7 @@ define KernelPackage/leds-gpio
   DEPENDS:= @GPIO_SUPPORT
   KCONFIG:=CONFIG_LEDS_GPIO
   FILES:=$(LINUX_DIR)/drivers/leds/leds-gpio.ko
-  AUTOLOAD:=$(call AutoLoad,60,leds-gpio)
+  AUTOLOAD:=$(call AutoLoad,60,leds-gpio,1)
 endef
 
 define KernelPackage/leds-gpio/description
@@ -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
 
@@ -108,7 +108,7 @@ $(eval $(call KernelPackage,ledtrig-netfilter))
 define KernelPackage/ledtrig-usbdev
   SUBMENU:=$(LEDS_MENU)
   TITLE:=LED USB device Trigger
-  DEPENDS:=@USB_SUPPORT +kmod-usb-core
+  DEPENDS:=@USB_SUPPORT kmod-usb-core
   KCONFIG:=CONFIG_LEDS_TRIGGER_USBDEV
   FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-usbdev.ko
   AUTOLOAD:=$(call AutoLoad,50,ledtrig-usbdev)
@@ -125,8 +125,8 @@ 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
-  AUTOLOAD:=$(call AutoLoad,50,ledtrig-default-on)
+  FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-default-on.ko
+  AUTOLOAD:=$(call AutoLoad,50,ledtrig-default-on,1)
 endef
 
 define KernelPackage/ledtrig-default-on/description
@@ -140,8 +140,8 @@ define KernelPackage/ledtrig-timer
   SUBMENU:=$(LEDS_MENU)
   TITLE:=LED Timer Trigger
   KCONFIG:=CONFIG_LEDS_TRIGGER_TIMER
-  FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-timer.ko
-  AUTOLOAD:=$(call AutoLoad,50,ledtrig-timer)
+  FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-timer.ko
+  AUTOLOAD:=$(call AutoLoad,50,ledtrig-timer,1)
 endef
 
 define KernelPackage/ledtrig-timer/description
@@ -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