aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/winbond
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-08-24 12:25:30 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-08-24 12:25:30 -0400
commitf20b6213f193f455a62ef9299ceca11f5531dff8 (patch)
tree737a14af45038252fc0e3863d62dde09432cd779 /drivers/staging/winbond
parente6e94e392fddb8845bdd2e199f55ebf7d76cb58d (diff)
parenta4881cc45a3fab4488e16c4934e149cfa620f1a9 (diff)
downloadlinaro-lsk-f20b6213f193f455a62ef9299ceca11f5531dff8.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/staging/winbond')
-rw-r--r--drivers/staging/winbond/wbusb.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c
index 0ca857ac473..48aa1361903 100644
--- a/drivers/staging/winbond/wbusb.c
+++ b/drivers/staging/winbond/wbusb.c
@@ -119,7 +119,9 @@ static void wbsoft_configure_filter(struct ieee80211_hw *dev,
*total_flags = new_flags;
}
-static void wbsoft_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
+static void wbsoft_tx(struct ieee80211_hw *dev,
+ struct ieee80211_tx_control *control,
+ struct sk_buff *skb)
{
struct wbsoft_priv *priv = dev->priv;