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

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
 
 #

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