diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-11-30 22:25:54 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-12-06 22:54:26 +0100 |
| commit | 9035c08635eaaf6d381fac54febf5816dcc4fae6 (patch) | |
| tree | 9da04f20e16fb1c0f0cbf5198a4fff41e4d65af8 /patches/0016-libertas-olpc-ec-wakeup | |
| parent | b198137b5b0011ed7ea8b58f2b6a3e391ceec662 (diff) | |
backports: Refresh patches on kernel 4.20-rc4
This patch was merged upstream and removed from backports:
* patches/0090-use-skb_pad.patch
This patch was manually modified:
* patches/0025-usb-sg/usbnet.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.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 6dace46d..22108262 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 -@@ -938,6 +938,7 @@ static int if_usb_suspend(struct usb_int +@@ -939,6 +939,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) -@@ -946,6 +947,7 @@ static int if_usb_suspend(struct usb_int +@@ -947,6 +948,7 @@ static int if_usb_suspend(struct usb_int olpc_ec_wakeup_set(EC_SCI_SRC_WLAN); } #endif |