Merge remote-tracking branch 'staging/staging-next'

[karo-tx-linux.git] / drivers / staging / rtl8187se / r8180_wx.c

diff --git a/drivers/staging/rtl8187se/r8180_wx.c b/drivers/staging/rtl8187se/r8180_wx.c
index dab787542c45d6d9efc2c67ea2e1dfc16443cc20..098e368835e267467c5e8304d1a372769aa7dde4 100644 (file)
--- a/drivers/staging/rtl8187se/r8180_wx.c
+++ b/drivers/staging/rtl8187se/r8180_wx.c
@@ -50,8 +50,9 @@ static int r8180_wx_get_freq(struct net_device *dev,
 }
 
 
-int r8180_wx_set_key(struct net_device *dev, struct iw_request_info *info,
-                    union iwreq_data *wrqu, char *key)
+static int r8180_wx_set_key(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *key)
 {
        struct r8180_priv *priv = ieee80211_priv(dev);
        struct iw_point *erq = &(wrqu->encoding);