diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-02 08:58:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-02 08:58:58 +0100 |
| commit | 45766f443815423b419a2f9e7936e3294027b1a2 (patch) | |
| tree | 56bfcd75e292fae37857d02625142af737ee62da | |
| parent | b9c8d6ba811f5b99d6c090b9204e2966e54aef51 (diff) | |
| parent | aa08ca16415cd14f6b426ed530636485c1582443 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | target/foxg20/kernel.config | 21 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 6 |
2 files changed, 10 insertions, 17 deletions
diff --git a/target/foxg20/kernel.config b/target/foxg20/kernel.config index b181e6633..9ae61b12b 100644 --- a/target/foxg20/kernel.config +++ b/target/foxg20/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.33 -# Sun Feb 28 11:34:04 2010 +# Sun Feb 28 14:11:17 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -371,7 +371,7 @@ CONFIG_NET=y # Networking options # CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y +# CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y # CONFIG_NET_KEY is not set CONFIG_INET=y @@ -392,8 +392,7 @@ CONFIG_IP_FIB_HASH=y # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y +# CONFIG_INET_DIAG is not set # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" @@ -792,19 +791,7 @@ CONFIG_GPIO_SYSFS=y # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set # CONFIG_THERMAL is not set -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -# CONFIG_SOFT_WATCHDOG is not set -CONFIG_AT91SAM9X_WATCHDOG=y - -# -# USB-based Watchdog Cards -# -# CONFIG_USBPCWATCHDOG is not set +# CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y # diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 457fcaba2..9ba5f6556 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -172,6 +172,10 @@ config ADK_KERNEL_MAC80211_VERBOSE_DEBUG boolean default n +config ADK_KERNEL_MAC80211_DEBUGFS + boolean + default n + config ADK_KPACKAGE_KMOD_MAC80211 prompt "kmod-mac80211.................. mac80211 softmac" tristate @@ -189,6 +193,8 @@ config ADK_DEBUG_MAC80211 boolean prompt "enable verbose debugging messages in mac80211" select ADK_KERNEL_MAC80211_VERBOSE_DEBUG + select ADK_KERNEL_MAC80211_DEBUGFS + select ADK_KERNEL_DEBUG_FS default n depends on ADK_KPACKAGE_KMOD_MAC80211 help |