diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2008-05-14 00:05:50 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-05-14 16:29:31 -0400 |
commit | 88787d2842b6e6ff9bdc218445209c5e3c84d6fa (patch) | |
tree | bbe28e793807a9f59fb410b4d799b9c4fbfea923 /drivers | |
parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) |
wireless: fix "iwlwifi: unify init driver flow"
drivers/net/wireless/iwlwifi/iwl-core.c: In function 'iwlcore_init_geos':
drivers/net/wireless/iwlwifi/iwl-core.c:323: error: implicit declaration of function 'iwlcore_init_ht_hw_capab'
This (or something like it) should be folded into the base patch to avoid
breaking bisection, please.
Cc: Ron Rindjunsky <ron.rindjunsky@intel.com>
Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index c4b5c1a100f2..55e3d139f427 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -259,6 +259,12 @@ static void iwlcore_init_ht_hw_capab(const struct iwl_priv *priv, | |||
259 | if (priv->hw_params.tx_chains_num >= 3) | 259 | if (priv->hw_params.tx_chains_num >= 3) |
260 | ht_info->supp_mcs_set[2] = 0xFF; | 260 | ht_info->supp_mcs_set[2] = 0xFF; |
261 | } | 261 | } |
262 | #else | ||
263 | static inline void iwlcore_init_ht_hw_capab(const struct iwl_priv *priv, | ||
264 | struct ieee80211_ht_info *ht_info, | ||
265 | enum ieee80211_band band) | ||
266 | { | ||
267 | } | ||
262 | #endif /* CONFIG_IWL4965_HT */ | 268 | #endif /* CONFIG_IWL4965_HT */ |
263 | 269 | ||
264 | static void iwlcore_init_hw_rates(struct iwl_priv *priv, | 270 | static void iwlcore_init_hw_rates(struct iwl_priv *priv, |