diff --git a/[refs] b/[refs] index f14fa674029e..d5a12c3869e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73d924bfe384af21b67f25698bde925f9b02e795 +refs/heads/master: 9996059d8bab60635ab662c23d85222af5402ced diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c index 235cc5906d9a..63e2173937e5 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c @@ -101,7 +101,8 @@ static s32 wl_cfg80211_config_default_mgmt_key(struct wiphy *wiphy, struct net_device *dev, u8 key_idx); static s32 wl_cfg80211_resume(struct wiphy *wiphy); -static s32 wl_cfg80211_suspend(struct wiphy *wiphy); +static s32 wl_cfg80211_suspend(struct wiphy *wiphy, + struct cfg80211_wowlan *wow); static s32 wl_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_pmksa *pmksa); static s32 wl_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev, @@ -2092,7 +2093,7 @@ static s32 wl_cfg80211_resume(struct wiphy *wiphy) return 0; } -static s32 wl_cfg80211_suspend(struct wiphy *wiphy) +static s32 wl_cfg80211_suspend(struct wiphy *wiphy, struct cfg80211_wowlan *wow) { struct wl_priv *wl = wiphy_to_wl(wiphy); struct net_device *ndev = wl_to_ndev(wl);