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/0016-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.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/0016-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch')
| -rw-r--r-- | patches/0016-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/0016-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch b/patches/0016-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch index 22108262..c9cb687a 100644 --- a/patches/0016-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch +++ b/patches/0016-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/marvell/libertas/if_usb.c +++ b/drivers/net/wireless/marvell/libertas/if_usb.c -@@ -939,6 +939,7 @@ static int if_usb_suspend(struct usb_int +@@ -940,6 +940,7 @@ static int if_usb_suspend(struct usb_int goto out; } @@ -8,7 +8,7 @@ #ifdef CONFIG_OLPC if (machine_is_olpc()) { if (priv->wol_criteria == EHS_REMOVE_WAKEUP) -@@ -947,6 +948,7 @@ static int if_usb_suspend(struct usb_int +@@ -948,6 +949,7 @@ static int if_usb_suspend(struct usb_int olpc_ec_wakeup_set(EC_SCI_SRC_WLAN); } #endif |