diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-13 17:29:14 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-13 17:29:14 +0100 |
| commit | 897be7157eb98898fdc62224857025d4a0f01dd5 (patch) | |
| tree | 763f672beb5d7b5c44099aa3e4cea747ef9f9c7f /target/linux/config | |
| parent | 607e1fc199759ad073742bdd4d667c3947c2c5ca (diff) | |
| parent | 61f978300c334c3e2466d24bed56ae6a1720d2b2 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux/config')
| -rw-r--r-- | target/linux/config/Config.in.leds | 28 | ||||
| -rw-r--r-- | target/linux/config/Config.in.network | 8 |
2 files changed, 29 insertions, 7 deletions
diff --git a/target/linux/config/Config.in.leds b/target/linux/config/Config.in.leds index 54cda3ceb..88acae81e 100644 --- a/target/linux/config/Config.in.leds +++ b/target/linux/config/Config.in.leds @@ -1,6 +1,10 @@ config ADK_KERNEL_NEW_LEDS boolean +config ADK_KERNEL_LEDS_CLASS + boolean + select ADK_KERNEL_NEW_LEDS + config ADK_KERNEL_LEDS_TRIGGERS boolean select ADK_KERNEL_NEW_LEDS @@ -8,17 +12,27 @@ config ADK_KERNEL_LEDS_TRIGGERS menu "LEDS driver support" depends on ADK_TARGET_WITH_LEDS -config ADK_KPACKAGE_KMOD_LEDS_CLASS - prompt "LED Class support" +config ADK_KPACKAGE_KMOD_LEDS_MIKROTIK_RB532 + prompt "LED suppport for RB532" tristate - select ADK_KERNEL_NEW_LEDS + select ADK_KERNEL_LEDS_CLASS + depends on ADK_TARGET_SYSTEM_MIKROTIK_RB532 + default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532 + default n + +config ADK_KPACKAGE_KMOD_LEDS_WRAP + prompt "LED suppport for WRAP" + tristate + select ADK_KERNEL_LEDS_CLASS + depends on ADK_TARGET_SYSTEM_PCENGINES_WRAP + default y if ADK_TARGET_SYSTEM_PCENGINES_WRAP default n - help config ADK_KPACKAGE_KMOD_LEDS_ALIX2 prompt "LED suppport for ALIX2/ALIX3" tristate - select ADK_KPACKAGE_KMOD_LEDS_CLASS + select ADK_KERNEL_LEDS_CLASS + depends on ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default n @@ -27,24 +41,28 @@ config ADK_KPACKAGE_KMOD_LEDS_TRIGGER_TIMER prompt "LED Timer trigger" tristate select ADK_KERNEL_LEDS_TRIGGERS + select ADK_KERNEL_LEDS_CLASS default n config ADK_KPACKAGE_KMOD_LEDS_TRIGGER_HEARTBEAT prompt "LED Heartbeat trigger" tristate select ADK_KERNEL_LEDS_TRIGGERS + select ADK_KERNEL_LEDS_CLASS default n config ADK_KPACKAGE_KMOD_LEDS_TRIGGER_DEFAULT_ON prompt "LED Default On trigger" tristate select ADK_KERNEL_LEDS_TRIGGERS + select ADK_KERNEL_LEDS_CLASS default n config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_LED prompt "LED IPTables trigger" tristate select ADK_KERNEL_LEDS_TRIGGERS + select ADK_KERNEL_LEDS_CLASS select ADK_PACKAGE_IPTABLES default n diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index b7555bd12..1bbf681dc 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -24,6 +24,10 @@ config ADK_KERNEL_NET_IPGRE_BROADCAST boolean default n +config ADK_KERNEL_NET_IPGRE_DEMUX + boolean + default n + config ADK_KERNEL_PPP_ASYNC boolean default n @@ -134,11 +138,11 @@ config ADK_KPACKAGE_KMOD_NET_IPIP mobile-IP facilities (allowing laptops to seamlessly move between networks without changing their IP addresses). - config ADK_KPACKAGE_KMOD_NET_IPGRE prompt "kmod-net-ipgre.................... GRE tunnels over IP" tristate - #depends on ADK_KPACKAGE_KMOD_NET_IPGRE_BROADCAST + select ADK_KERNEL_NET_IPGRE_BROADCAST + select ADK_KERNEL_NET_IPGRE_DEMUX default n help Tunneling means encapsulating data of one protocol type within |