From 3f428fae8fee69ad8f79de9bd69c91be5197f6fd Mon Sep 17 00:00:00 2001
From: Helmut Schaa <helmut.schaa@googlemail.com>
Date: Wed, 30 Jun 2010 08:48:42 +0200
Subject: [PATCH] --- yaml --- r: 203335 b: refs/heads/master c:
 92b50c4b5b01d0ba4efcff9e85f7a76b620fe789 h: refs/heads/master i:   203333:
 db2e9540cc3b4bd2308891e4fcb0cac9eb8975db   203331:
 15b031f5148311489b8224caae79dfe973c7c9d9   203327:
 323f60d7c39e46ff9864c787928fe6ccbdfdddfa v: v3

---
 [refs]                     | 2 +-
 trunk/net/mac80211/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 71e46bac2317..5b5d36cce5ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f860d526eb2939a1c37128900b5af2b6f3ff7f20
+refs/heads/master: 92b50c4b5b01d0ba4efcff9e85f7a76b620fe789
diff --git a/trunk/net/mac80211/Kconfig b/trunk/net/mac80211/Kconfig
index 83eec7a8bd1f..4d6f8653ec88 100644
--- a/trunk/net/mac80211/Kconfig
+++ b/trunk/net/mac80211/Kconfig
@@ -69,6 +69,7 @@ endchoice
 
 config MAC80211_RC_DEFAULT
 	string
+	default "minstrel_ht" if MAC80211_RC_DEFAULT_MINSTREL && MAC80211_RC_MINSTREL_HT
 	default "minstrel" if MAC80211_RC_DEFAULT_MINSTREL
 	default "pid" if MAC80211_RC_DEFAULT_PID
 	default ""