Permalink
Browse files

Merge remote-tracking branch 'gnutoo/master'

  • Loading branch information...
2 parents 562a48d + 703053a commit 2d8ddee53a382c185673658f852c8f8da0bd6989 @theterg theterg committed Jul 31, 2012
Showing with 6 additions and 3 deletions.
  1. +6 −3 arch/arm/configs/omap3_buglabs_defconfig
View
9 arch/arm/configs/omap3_buglabs_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.35.10
-# Thu May 24 19:01:23 2012
+# Tue Jul 17 23:54:06 2012
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -668,11 +668,13 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
# CONFIG_TIPC is not set
# CONFIG_ATM is not set
# CONFIG_L2TP is not set
+CONFIG_STP=y
CONFIG_BRIDGE=y
CONFIG_BRIDGE_IGMP_SNOOPING=y
# CONFIG_NET_DSA is not set
# CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
+CONFIG_LLC=y
# CONFIG_LLC2 is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
@@ -725,7 +727,7 @@ CONFIG_WIRELESS_EXT=y
CONFIG_WEXT_CORE=y
CONFIG_WEXT_PROC=y
CONFIG_WEXT_SPY=y
-CONFIG_CFG80211=y
+CONFIG_CFG80211=m
# CONFIG_NL80211_TESTMODE is not set
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
# CONFIG_CFG80211_REG_DEBUG is not set
@@ -736,7 +738,7 @@ CONFIG_CFG80211_WEXT=y
CONFIG_WIRELESS_EXT_SYSFS=y
CONFIG_LIB80211=y
# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=y
+CONFIG_MAC80211=m
CONFIG_MAC80211_HAS_RC=y
CONFIG_MAC80211_RC_PID=y
CONFIG_MAC80211_RC_MINSTREL=y
@@ -2154,6 +2156,7 @@ CONFIG_BMI_RFID=m
CONFIG_BMI_DECT=m
CONFIG_BMI_BATTERY=m
CONFIG_BMI_DLNA_MEDIA=m
+
#
# File systems
#

0 comments on commit 2d8ddee

Please sign in to comment.