summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-01-13 23:25:47 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-01-13 23:25:47 +0100
commit827c15388b9eeb99288f5fc0fec037265cdd791a (patch)
tree58763db0f8192d8d542027956da74d92c4ec1b70
parent5003dd62441eed5fa2a96edc48431d17234203f7 (diff)
parentb446a21956b1d6369d6803237a84da488e1b9ce6 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--mk/modules.mk17
-rw-r--r--target/linux/config/Config.in.leds31
2 files changed, 48 insertions, 0 deletions
diff --git a/mk/modules.mk b/mk/modules.mk
index 7eff3ebc8..c208b80a7 100644
--- a/mk/modules.mk
+++ b/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
#
diff --git a/target/linux/config/Config.in.leds b/target/linux/config/Config.in.leds
index 4beeefbe3..6a5410fc2 100644
--- a/target/linux/config/Config.in.leds
+++ b/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