aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2010-10-06 11:14:21 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2010-10-06 11:14:21 -0400
commit58a39090a13cf296afc17ed8fd793a55340b63db (patch)
treeca78317a2920d2bf0f9db3020977513d1f5e06d4 /drivers/net/wireless/iwlwifi/iwl-agn.c
parent898dade1162970fe7af45e47062f9d1d999c46e6 (diff)
iwlagn: define 130 series of WiFi/BT combo devices
add new structures and defines need to identify 130 devices. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 080121d3a3ae..a6dce616ee3c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -4822,11 +4822,21 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
4822 {IWL_PCI_DEVICE(0x0084, 0x1216, iwl1000_bg_cfg)}, 4822 {IWL_PCI_DEVICE(0x0084, 0x1216, iwl1000_bg_cfg)},
4823 {IWL_PCI_DEVICE(0x0084, 0x1316, iwl1000_bg_cfg)}, 4823 {IWL_PCI_DEVICE(0x0084, 0x1316, iwl1000_bg_cfg)},
4824 4824
4825/* 100 Series WiFi */
4825 {IWL_PCI_DEVICE(0x08AE, 0x1005, iwl100_bgn_cfg)}, 4826 {IWL_PCI_DEVICE(0x08AE, 0x1005, iwl100_bgn_cfg)},
4826 {IWL_PCI_DEVICE(0x08AF, 0x1015, iwl100_bgn_cfg)}, 4827 {IWL_PCI_DEVICE(0x08AF, 0x1015, iwl100_bgn_cfg)},
4827 {IWL_PCI_DEVICE(0x08AE, 0x1025, iwl100_bgn_cfg)}, 4828 {IWL_PCI_DEVICE(0x08AE, 0x1025, iwl100_bgn_cfg)},
4828 {IWL_PCI_DEVICE(0x08AE, 0x1007, iwl100_bg_cfg)}, 4829 {IWL_PCI_DEVICE(0x08AE, 0x1007, iwl100_bg_cfg)},
4829 {IWL_PCI_DEVICE(0x08AE, 0x1017, iwl100_bg_cfg)}, 4830 {IWL_PCI_DEVICE(0x08AE, 0x1017, iwl100_bg_cfg)},
4831
4832/* 130 Series WiFi */
4833 {IWL_PCI_DEVICE(0x0896, 0x5005, iwl130_bgn_cfg)},
4834 {IWL_PCI_DEVICE(0x0896, 0x5007, iwl130_bg_cfg)},
4835 {IWL_PCI_DEVICE(0x0897, 0x5015, iwl130_bgn_cfg)},
4836 {IWL_PCI_DEVICE(0x0897, 0x5017, iwl130_bg_cfg)},
4837 {IWL_PCI_DEVICE(0x0896, 0x5025, iwl130_bgn_cfg)},
4838 {IWL_PCI_DEVICE(0x0896, 0x5027, iwl130_bg_cfg)},
4839
4830#endif /* CONFIG_IWL5000 */ 4840#endif /* CONFIG_IWL5000 */
4831 4841
4832 {0} 4842 {0}