diff --git a/[refs] b/[refs] index 73e344b46fb8..60806c943554 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf95d20fdbd602d72c28a009a55d90d5109b8a86 +refs/heads/master: 3264690b04ce4edc517fa5d31fa72496f71a7321 diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c index f6f8895bbc89..27298b19d5bd 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c @@ -646,8 +646,8 @@ static int wl1271_op_config_interface(struct ieee80211_hw *hw, struct sk_buff *beacon; int ret; - wl1271_debug(DEBUG_MAC80211, "mac80211 config_interface bssid %s", - printf("%pM", conf->bssid); + wl1271_debug(DEBUG_MAC80211, "mac80211 config_interface bssid %pM", + conf->bssid); wl1271_dump_ascii(DEBUG_MAC80211, "ssid: ", conf->ssid, conf->ssid_len);