Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index b9eded88c322..4f725473fb73 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -2271,7 +2271,6 @@ static int mwl8k_cmd_update_sta_db(struct ieee80211_hw *hw,
         struct mwl8k_cmd_update_sta_db *cmd;
         struct peer_capability_info *peer_info;
         struct ieee80211_rate *bitrates = mv_vif->legacy_rates;
-        DECLARE_MAC_BUF(mac);
         int rc;
         __u8 count, *rates;
 
@@ -3480,7 +3479,6 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
 {
         struct ieee80211_hw *hw;
         struct mwl8k_priv *priv;
-        DECLARE_MAC_BUF(mac);
         int rc;
         int i;
         u8 *fw;
@@ -3669,8 +3667,8 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
                 MWL8K_DESC);
         printk(KERN_INFO "%s: Driver Ver:%s  Firmware Ver:%u.%u.%u.%u\n",
                 priv->name, MWL8K_VERSION, fw[3], fw[2], fw[1], fw[0]);
-        printk(KERN_INFO "%s: MAC Address: %s\n", priv->name,
-               print_mac(mac, hw->wiphy->perm_addr));
+        printk(KERN_INFO "%s: MAC Address: %pM\n", priv->name,
+                hw->wiphy->perm_addr);
 
         return 0;