summaryrefslogtreecommitdiff
path: root/patches/0016-libertas-olpc-ec-wakeup
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2019-09-27 21:36:58 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2019-10-09 23:03:23 +0200
commited333684709658e6a5a0dd6f321eb0c9dccd826f (patch)
treedafeb8e32982327ddd7eb3fe016683a7806670ad /patches/0016-libertas-olpc-ec-wakeup
parent4ec72687181df4b786152747c008a688c9b9b9de (diff)
backports: patches: Refresh against kernel 5.4-rc2
Manual modifications where needed to make the following patch apply: patches/0013-fix-makefile-includes/rtw88.patch Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/0016-libertas-olpc-ec-wakeup')
-rw-r--r--patches/0016-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch4
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 c9cb687a..8fab382a 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
-@@ -940,6 +940,7 @@ static int if_usb_suspend(struct usb_int
+@@ -941,6 +941,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)
-@@ -948,6 +949,7 @@ static int if_usb_suspend(struct usb_int
+@@ -949,6 +950,7 @@ static int if_usb_suspend(struct usb_int
olpc_ec_wakeup_set(EC_SCI_SRC_WLAN);
}
#endif