Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e46316c8 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

parents a50f9d5e efc5520c

drivers/net/wireless/iwlwifi/pcie/drv.c

+8 −2
Original line number Diff line number Diff line
@@ -357,21 +357,27 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { 
	{IWL_PCI_DEVICE(0x095B, 0x5310, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095B, 0x5302, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095B, 0x5210, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095B, 0x5012, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095B, 0x500A, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5012, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x500A, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5410, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5400, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x1010, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5000, iwl7265_2n_cfg)},

	{IWL_PCI_DEVICE(0x095B, 0x5200, iwl7265_2n_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5002, iwl7265_n_cfg)},

	{IWL_PCI_DEVICE(0x095B, 0x5202, iwl7265_n_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x9010, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x9110, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x9210, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x9510, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x9310, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x9410, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5020, iwl7265_2n_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x502A, iwl7265_2n_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5420, iwl7265_2n_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5090, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5190, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5590, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095B, 0x5290, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5490, iwl7265_2ac_cfg)},

#endif /* CONFIG_IWLMVM */