diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-06-03 14:31:50 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-03 14:31:50 -0400 |
commit | 7b29dc21ea084be7ddfb536994a9cfae95337690 (patch) | |
tree | 799f5becd9484e53e09b5f620ebfd5315bdfe033 /drivers/net/wireless/iwlwifi/iwl-agn.h | |
parent | 9a2e0fb0893ddf595d0a372e681f5b98017c6d90 (diff) | |
parent | dfe21582ac5ebc460dda98c67e8589dd506d02cd (diff) | |
download | lwn-7b29dc21ea084be7ddfb536994a9cfae95337690.tar.gz lwn-7b29dc21ea084be7ddfb536994a9cfae95337690.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h index 2495fe7a58cb..d1716844002e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn.h @@ -89,6 +89,7 @@ extern struct iwl_cfg iwl6000_3agn_cfg; extern struct iwl_cfg iwl6050_2agn_cfg; extern struct iwl_cfg iwl6050_2abg_cfg; extern struct iwl_cfg iwl6150_bgn_cfg; +extern struct iwl_cfg iwl6150_bg_cfg; extern struct iwl_cfg iwl1000_bgn_cfg; extern struct iwl_cfg iwl1000_bg_cfg; extern struct iwl_cfg iwl100_bgn_cfg; |