aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-02-22 13:12:34 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-02-22 13:12:34 +0000
commitb2373ac5163d7a7355d1a6e2d2405188f07c5eb7 (patch)
tree4e92cda62fe7f0c40fe9f9ff053b91cace3a4693
parent11014b5cea049006554f2eddc157196c9dc431a8 (diff)
downloadupstream-b2373ac5163d7a7355d1a6e2d2405188f07c5eb7.tar.gz
upstream-b2373ac5163d7a7355d1a6e2d2405188f07c5eb7.tar.bz2
upstream-b2373ac5163d7a7355d1a6e2d2405188f07c5eb7.zip
re-apply r14531
SVN-Revision: 14614
-rw-r--r--target/linux/generic-2.6/config-2.6.272
-rw-r--r--target/linux/generic-2.6/config-2.6.282
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/config-2.6.27 b/target/linux/generic-2.6/config-2.6.27
index 1316a1dd4c..20d8982caa 100644
--- a/target/linux/generic-2.6/config-2.6.27
+++ b/target/linux/generic-2.6/config-2.6.27
@@ -806,7 +806,7 @@ CONFIG_LOCKD_V4=y
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_LSF is not set
# CONFIG_LXT_PHY is not set
-# CONFIG_MAC80211 is not set
+CONFIG_MAC80211=m
# CONFIG_MAC80211_DEBUG is not set
# CONFIG_MAC80211_DEBUGFS is not set
# CONFIG_MAC80211_DEBUG_MENU is not set
diff --git a/target/linux/generic-2.6/config-2.6.28 b/target/linux/generic-2.6/config-2.6.28
index d1772d6ee1..3899721773 100644
--- a/target/linux/generic-2.6/config-2.6.28
+++ b/target/linux/generic-2.6/config-2.6.28
@@ -843,7 +843,7 @@ CONFIG_LOCKD_V4=y
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_LSF is not set
# CONFIG_LXT_PHY is not set
-# CONFIG_MAC80211 is not set
+CONFIG_MAC80211=m
# CONFIG_MAC80211_DEBUG is not set
# CONFIG_MAC80211_DEBUGFS is not set
# CONFIG_MAC80211_DEBUG_MENU is not set