tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
+8
-2
+8
-2
drivers/net/wireless/iwlwifi/pcie/drv.c
+8
-2
drivers/net/wireless/iwlwifi/pcie/drv.c
···
357
357
{IWL_PCI_DEVICE(0x095B, 0x5310, iwl7265_2ac_cfg)},
358
358
{IWL_PCI_DEVICE(0x095B, 0x5302, iwl7265_2ac_cfg)},
359
359
{IWL_PCI_DEVICE(0x095B, 0x5210, iwl7265_2ac_cfg)},
360
-
{IWL_PCI_DEVICE(0x095B, 0x5012, iwl7265_2ac_cfg)},
361
-
{IWL_PCI_DEVICE(0x095B, 0x500A, iwl7265_2ac_cfg)},
360
+
{IWL_PCI_DEVICE(0x095A, 0x5012, iwl7265_2ac_cfg)},
361
+
{IWL_PCI_DEVICE(0x095A, 0x500A, iwl7265_2ac_cfg)},
362
362
{IWL_PCI_DEVICE(0x095A, 0x5410, iwl7265_2ac_cfg)},
363
+
{IWL_PCI_DEVICE(0x095A, 0x5400, iwl7265_2ac_cfg)},
363
364
{IWL_PCI_DEVICE(0x095A, 0x1010, iwl7265_2ac_cfg)},
364
365
{IWL_PCI_DEVICE(0x095A, 0x5000, iwl7265_2n_cfg)},
365
366
{IWL_PCI_DEVICE(0x095B, 0x5200, iwl7265_2n_cfg)},
366
367
{IWL_PCI_DEVICE(0x095A, 0x5002, iwl7265_n_cfg)},
367
368
{IWL_PCI_DEVICE(0x095B, 0x5202, iwl7265_n_cfg)},
368
369
{IWL_PCI_DEVICE(0x095A, 0x9010, iwl7265_2ac_cfg)},
370
+
{IWL_PCI_DEVICE(0x095A, 0x9110, iwl7265_2ac_cfg)},
369
371
{IWL_PCI_DEVICE(0x095A, 0x9210, iwl7265_2ac_cfg)},
372
+
{IWL_PCI_DEVICE(0x095A, 0x9510, iwl7265_2ac_cfg)},
373
+
{IWL_PCI_DEVICE(0x095A, 0x9310, iwl7265_2ac_cfg)},
370
374
{IWL_PCI_DEVICE(0x095A, 0x9410, iwl7265_2ac_cfg)},
371
375
{IWL_PCI_DEVICE(0x095A, 0x5020, iwl7265_2n_cfg)},
372
376
{IWL_PCI_DEVICE(0x095A, 0x502A, iwl7265_2n_cfg)},
373
377
{IWL_PCI_DEVICE(0x095A, 0x5420, iwl7265_2n_cfg)},
374
378
{IWL_PCI_DEVICE(0x095A, 0x5090, iwl7265_2ac_cfg)},
379
+
{IWL_PCI_DEVICE(0x095A, 0x5190, iwl7265_2ac_cfg)},
380
+
{IWL_PCI_DEVICE(0x095A, 0x5590, iwl7265_2ac_cfg)},
375
381
{IWL_PCI_DEVICE(0x095B, 0x5290, iwl7265_2ac_cfg)},
376
382
{IWL_PCI_DEVICE(0x095A, 0x5490, iwl7265_2ac_cfg)},
377
383
#endif /* CONFIG_IWLMVM */