aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
authorJay Sternberg <jay.e.sternberg@linux.intel.com>2009-01-19 18:30:34 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 16:01:02 -0500
commite1228374d648efe451973bc5f3d1f9a8e943ec0b (patch)
tree2eea15627436bb15ebdef381c9f0d3f800db8995 /drivers/net/wireless/iwlwifi/iwl-agn.c
parentcec2d3f38c11f4c7e28ec2a065698653dbccfbb7 (diff)
iwlwifi: add recognition of Intel WiFi Link 6000 and 6050 Series
add configuration for new Intel WiFi Link Series as part of the iwlagn driver under the umbrella of 5000 family of devices. Signed-off-by: Jay Sternberg <jay.e.sternberg@linux.intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 4a15e42ad00a..632add14fa9b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -4173,6 +4173,18 @@ static struct pci_device_id iwl_hw_card_ids[] = {
4173/* 5150 Wifi/WiMax */ 4173/* 5150 Wifi/WiMax */
4174 {IWL_PCI_DEVICE(0x423C, PCI_ANY_ID, iwl5150_agn_cfg)}, 4174 {IWL_PCI_DEVICE(0x423C, PCI_ANY_ID, iwl5150_agn_cfg)},
4175 {IWL_PCI_DEVICE(0x423D, PCI_ANY_ID, iwl5150_agn_cfg)}, 4175 {IWL_PCI_DEVICE(0x423D, PCI_ANY_ID, iwl5150_agn_cfg)},
4176/* 6000/6050 Series */
4177 {IWL_PCI_DEVICE(0x0082, 0x1102, iwl6000_2ag_cfg)},
4178 {IWL_PCI_DEVICE(0x0085, 0x1112, iwl6000_2ag_cfg)},
4179 {IWL_PCI_DEVICE(0x0082, 0x1122, iwl6000_2ag_cfg)},
4180 {IWL_PCI_DEVICE(0x422B, PCI_ANY_ID, iwl6000_3agn_cfg)},
4181 {IWL_PCI_DEVICE(0x4238, PCI_ANY_ID, iwl6000_3agn_cfg)},
4182 {IWL_PCI_DEVICE(0x0082, PCI_ANY_ID, iwl6000_2agn_cfg)},
4183 {IWL_PCI_DEVICE(0x0085, PCI_ANY_ID, iwl6000_3agn_cfg)},
4184 {IWL_PCI_DEVICE(0x0086, PCI_ANY_ID, iwl6050_3agn_cfg)},
4185 {IWL_PCI_DEVICE(0x0087, PCI_ANY_ID, iwl6050_2agn_cfg)},
4186 {IWL_PCI_DEVICE(0x0088, PCI_ANY_ID, iwl6050_3agn_cfg)},
4187 {IWL_PCI_DEVICE(0x0089, PCI_ANY_ID, iwl6050_2agn_cfg)},
4176#endif /* CONFIG_IWL5000 */ 4188#endif /* CONFIG_IWL5000 */
4177 4189
4178 {0} 4190 {0}