Merge branch 'master' of git+ssh://openadk.org/git/openadk

mk/modules.mk

@@ -1105,6 +1105,23 @@ $(eval $(call KMOD_template,LEDS_CLASS,leds-class,\
 	$(MODULES_DIR)/kernel/drivers/leds/led-class \
 ,05))
 
+$(eval $(call KMOD_template,LEDS_TRIGGER_TIMER,leds-trigger-timer,\
+	$(MODULES_DIR)/kernel/drivers/leds/ledtrig-timer \
+,10))
+
+$(eval $(call KMOD_template,LEDS_TRIGGER_HEARTBEAT,leds-trigger-heartbeat,\
+	$(MODULES_DIR)/kernel/drivers/leds/ledtrig-heartbeat \
+,10))
+
+$(eval $(call KMOD_template,LEDS_TRIGGER_DEFAULT_ON,leds-trigger-default-on,\
+	$(MODULES_DIR)/kernel/drivers/leds/ledtrig-default-on \
+,10))
+
+$(eval $(call KMOD_template,NETFILTER_XT_TARGET_LED,netfilter-xt-target-led,\
+	$(MODULES_DIR)/kernel/net/netfilter/xt_LED \
+,90))
+
+
 #
 # NLS
 #

target/linux/config/Config.in.leds

@@ -9,7 +9,38 @@ config ADK_KERNEL_NEW_LEDS
 config ADK_KPACKAGE_KMOD_LEDS_CLASS
 	prompt "LED Class support"
 	tristate
+	select ADK_KERNEL_NEW_LEDS
 	default n
 	help
 
+config ADK_KERNEL_LEDS_TRIGGERS
+	bool
+	default n
+	help
+
+config ADK_KPACKAGE_KMOD_LEDS_TRIGGER_TIMER
+	prompt "LED Timer trigger"
+	tristate
+	select ADK_KERNEL_LEDS_TRIGGERS
+	default n
+
+config ADK_KPACKAGE_KMOD_LEDS_TRIGGER_HEARTBEAT
+	prompt "LED Heartbeat trigger"
+	tristate
+	select ADK_KERNEL_LEDS_TRIGGERS
+	default n
+
+config ADK_KPACKAGE_KMOD_LEDS_TRIGGER_DEFAULT_ON
+	prompt "LED Default On trigger"
+	tristate
+	select ADK_KERNEL_LEDS_TRIGGERS
+	default n
+
+config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_LED
+	prompt "LED IPTables trigger"
+	tristate
+	select ADK_KERNEL_LEDS_TRIGGERS
+	select ADK_PACKAGE_IPTABLES
+	default n
+
 endmenu