diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-05-24 22:24:34 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-06-30 17:41:45 +0200 |
| commit | 25fa8919b124f8d7585327988b2a0a4a325e87d6 (patch) | |
| tree | fad5ab3a0744958fa1cb3381f139981c90d766f1 /patches/0085-iwlwifi-pci-device-removal.patch | |
| parent | 1cc5efe8e280d78b5552bfee88bdac257151d888 (diff) | |
patches: Make patches apply on top of kernel 5.2-rc6
The cordic.c file was moved and the driver from drivers/staging/rtlwifi/
was removed in mainline kernel.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/0085-iwlwifi-pci-device-removal.patch')
| -rw-r--r-- | patches/0085-iwlwifi-pci-device-removal.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/0085-iwlwifi-pci-device-removal.patch b/patches/0085-iwlwifi-pci-device-removal.patch index b7536d93..fb3f37cf 100644 --- a/patches/0085-iwlwifi-pci-device-removal.patch +++ b/patches/0085-iwlwifi-pci-device-removal.patch @@ -2,7 +2,7 @@ diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wirel index f74281508197..3b11bd68f261 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c -@@ -1926,6 +1926,9 @@ static void iwl_trans_pcie_removal_wk(st +@@ -1948,6 +1948,9 @@ static void iwl_trans_pcie_removal_wk(st struct iwl_trans_pcie_removal *removal = container_of(wk, struct iwl_trans_pcie_removal, work); struct pci_dev *pdev = removal->pdev; @@ -12,7 +12,7 @@ index f74281508197..3b11bd68f261 100644 static char *prop[] = {"EVENT=INACCESSIBLE", NULL}; dev_err(&pdev->dev, "Device gone - attempting removal\n"); -@@ -1934,6 +1937,7 @@ static void iwl_trans_pcie_removal_wk(st +@@ -1956,6 +1959,7 @@ static void iwl_trans_pcie_removal_wk(st pci_dev_put(pdev); pci_stop_and_remove_bus_device(pdev); pci_unlock_rescan_remove(); |