From 1ee30e3c419824f45dc52d67516274548548b574 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 13 Jan 2011 17:26:47 +0100 Subject: update to Linux Kernel 2.6.37 --- target/linux/config/Config.in.leds | 28 +++++++++++++++++++++++----- target/linux/config/Config.in.network | 8 ++++++-- 2 files changed, 29 insertions(+), 7 deletions(-) (limited to 'target/linux/config') 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 -- cgit v1.2.3