aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/pcie/drv.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-01-14 17:37:09 -0500
committerDavid S. Miller <davem@davemloft.net>2014-01-14 17:42:42 -0500
commit0a379e21c503b2ff66b44d588df9f231e9b0b9ca (patch)
tree22b875fcf4b67fcd007726f00c5fc1748ce985d0 /drivers/net/wireless/iwlwifi/pcie/drv.c
parenta49da8811e71c5355b52c65ee32976741d5834cd (diff)
parentfdc3452cd2c7b2bfe0f378f92123f4f9a98fa2bd (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie/drv.c')
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/drv.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c
index e58b8af56c04..3040924f5f3c 100644
--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@ -362,21 +362,27 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
362 {IWL_PCI_DEVICE(0x095B, 0x5310, iwl7265_2ac_cfg)}, 362 {IWL_PCI_DEVICE(0x095B, 0x5310, iwl7265_2ac_cfg)},
363 {IWL_PCI_DEVICE(0x095B, 0x5302, iwl7265_2ac_cfg)}, 363 {IWL_PCI_DEVICE(0x095B, 0x5302, iwl7265_2ac_cfg)},
364 {IWL_PCI_DEVICE(0x095B, 0x5210, iwl7265_2ac_cfg)}, 364 {IWL_PCI_DEVICE(0x095B, 0x5210, iwl7265_2ac_cfg)},
365 {IWL_PCI_DEVICE(0x095B, 0x5012, iwl7265_2ac_cfg)}, 365 {IWL_PCI_DEVICE(0x095A, 0x5012, iwl7265_2ac_cfg)},
366 {IWL_PCI_DEVICE(0x095B, 0x500A, iwl7265_2ac_cfg)}, 366 {IWL_PCI_DEVICE(0x095A, 0x500A, iwl7265_2ac_cfg)},
367 {IWL_PCI_DEVICE(0x095A, 0x5410, iwl7265_2ac_cfg)}, 367 {IWL_PCI_DEVICE(0x095A, 0x5410, iwl7265_2ac_cfg)},
368 {IWL_PCI_DEVICE(0x095A, 0x5400, iwl7265_2ac_cfg)},
368 {IWL_PCI_DEVICE(0x095A, 0x1010, iwl7265_2ac_cfg)}, 369 {IWL_PCI_DEVICE(0x095A, 0x1010, iwl7265_2ac_cfg)},
369 {IWL_PCI_DEVICE(0x095A, 0x5000, iwl7265_2n_cfg)}, 370 {IWL_PCI_DEVICE(0x095A, 0x5000, iwl7265_2n_cfg)},
370 {IWL_PCI_DEVICE(0x095B, 0x5200, iwl7265_2n_cfg)}, 371 {IWL_PCI_DEVICE(0x095B, 0x5200, iwl7265_2n_cfg)},
371 {IWL_PCI_DEVICE(0x095A, 0x5002, iwl7265_n_cfg)}, 372 {IWL_PCI_DEVICE(0x095A, 0x5002, iwl7265_n_cfg)},
372 {IWL_PCI_DEVICE(0x095B, 0x5202, iwl7265_n_cfg)}, 373 {IWL_PCI_DEVICE(0x095B, 0x5202, iwl7265_n_cfg)},
373 {IWL_PCI_DEVICE(0x095A, 0x9010, iwl7265_2ac_cfg)}, 374 {IWL_PCI_DEVICE(0x095A, 0x9010, iwl7265_2ac_cfg)},
375 {IWL_PCI_DEVICE(0x095A, 0x9110, iwl7265_2ac_cfg)},
374 {IWL_PCI_DEVICE(0x095A, 0x9210, iwl7265_2ac_cfg)}, 376 {IWL_PCI_DEVICE(0x095A, 0x9210, iwl7265_2ac_cfg)},
377 {IWL_PCI_DEVICE(0x095A, 0x9510, iwl7265_2ac_cfg)},
378 {IWL_PCI_DEVICE(0x095A, 0x9310, iwl7265_2ac_cfg)},
375 {IWL_PCI_DEVICE(0x095A, 0x9410, iwl7265_2ac_cfg)}, 379 {IWL_PCI_DEVICE(0x095A, 0x9410, iwl7265_2ac_cfg)},
376 {IWL_PCI_DEVICE(0x095A, 0x5020, iwl7265_2n_cfg)}, 380 {IWL_PCI_DEVICE(0x095A, 0x5020, iwl7265_2n_cfg)},
377 {IWL_PCI_DEVICE(0x095A, 0x502A, iwl7265_2n_cfg)}, 381 {IWL_PCI_DEVICE(0x095A, 0x502A, iwl7265_2n_cfg)},
378 {IWL_PCI_DEVICE(0x095A, 0x5420, iwl7265_2n_cfg)}, 382 {IWL_PCI_DEVICE(0x095A, 0x5420, iwl7265_2n_cfg)},
379 {IWL_PCI_DEVICE(0x095A, 0x5090, iwl7265_2ac_cfg)}, 383 {IWL_PCI_DEVICE(0x095A, 0x5090, iwl7265_2ac_cfg)},
384 {IWL_PCI_DEVICE(0x095A, 0x5190, iwl7265_2ac_cfg)},
385 {IWL_PCI_DEVICE(0x095A, 0x5590, iwl7265_2ac_cfg)},
380 {IWL_PCI_DEVICE(0x095B, 0x5290, iwl7265_2ac_cfg)}, 386 {IWL_PCI_DEVICE(0x095B, 0x5290, iwl7265_2ac_cfg)},
381 {IWL_PCI_DEVICE(0x095A, 0x5490, iwl7265_2ac_cfg)}, 387 {IWL_PCI_DEVICE(0x095A, 0x5490, iwl7265_2ac_cfg)},
382#endif /* CONFIG_IWLMVM */ 388#endif /* CONFIG_IWLMVM */