diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-11 14:48:32 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-11 14:48:32 -0400 |
| commit | 3899ba90a4ab2f3cab8e0f91a76c14ff131c8293 (patch) | |
| tree | ae82b469f8a7ceb42547d11dd1fe5c73abc8635b /drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | |
| parent | 45203a3b380cee28f570475c0d28c169f908c209 (diff) | |
| parent | 8b3e7be437a6b62118d0485ad971e724afe23fdf (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/ath/ath9k/debug.c
net/mac80211/iface.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-nvm-parse.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h index e57fb989661e..3325059c52d4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h +++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h @@ -75,6 +75,6 @@ struct iwl_nvm_data * iwl_parse_nvm_data(struct device *dev, const struct iwl_cfg *cfg, const __le16 *nvm_hw, const __le16 *nvm_sw, - const __le16 *nvm_calib); + const __le16 *nvm_calib, u8 tx_chains, u8 rx_chains); #endif /* __iwl_nvm_parse_h__ */ |