diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-09-17 18:58:10 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-09-21 15:16:55 +0200 |
| commit | 0acb6552992e7fb62b24a5ed48f46250fdff0494 (patch) | |
| tree | 15719bb5e469848c50cae42aaa533c355ba04dbe /patches/0016-libertas-olpc-ec-wakeup | |
| parent | 75ed12f298e69fcf618aeeefe89e507f8cfac87a (diff) | |
patches: refresh patches on v4.14-rc1
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
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 6f3e4244..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 -@@ -960,6 +960,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) -@@ -968,6 +969,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 |