]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
wireless: fix "iwlwifi: unify init driver flow"
authorAndrew Morton <akpm@linux-foundation.org>
Wed, 14 May 2008 04:05:50 +0000 (21:05 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 14 May 2008 20:29:31 +0000 (16:29 -0400)
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>
drivers/net/wireless/iwlwifi/iwl-core.c

index c4b5c1a100f29c0de1c1e963869f54a5a0b7b648..55e3d139f4279599ff16b5eb273e5f35509fd0ba 100644 (file)
@@ -259,6 +259,12 @@ static void iwlcore_init_ht_hw_capab(const struct iwl_priv *priv,
        if (priv->hw_params.tx_chains_num >= 3)
                ht_info->supp_mcs_set[2] = 0xFF;
 }
+#else
+static inline void iwlcore_init_ht_hw_capab(const struct iwl_priv *priv,
+                             struct ieee80211_ht_info *ht_info,
+                             enum ieee80211_band band)
+{
+}
 #endif /* CONFIG_IWL4965_HT */
 
 static void iwlcore_init_hw_rates(struct iwl_priv *priv,